Merge from origin/emacs-25

[gnu-emacs] / lisp / term.el

diff --git a/lisp/term.el b/lisp/term.el
index c1e827875d1652d06a686583d0f551d36eb34f4b..ecaca505683072b17fe939a3fe8106fe646adac2 100644 (file)
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -1462,6 +1462,13 @@ Using \"emacs\" loses, because bash disables editing if $TERM == emacs.")
           (format "TERMINFO=%s" data-directory)
           (format term-termcap-format "TERMCAP="
                   term-term-name term-height term-width)
+
+          ;; This is for backwards compatibility with Bash 4.3 and earlier.
+          ;; Remove this hack once Bash 4.4-or-later is common, because
+          ;; it breaks './configure' of some packages that expect it to
+          ;; say where to find EMACS.
+          (format "EMACS=%s (term:%s)" emacs-version term-protocol-version)
+
           (format "INSIDE_EMACS=%s,term:%s" emacs-version term-protocol-version)
           (format "LINES=%d" term-height)
           (format "COLUMNS=%d" term-width))