Comint and compile no longer set EMACS

This mostly restores the change that I reverted on March 23,
fixing most of Bug#20202.  The only part of the change that is
still reverted is the change to M-x term, where compatibility with
current Bash constrains us from moving too quickly (Bug#20484).
Problem reported by Phillip Lord in: http://bugs.gnu.org/20484#108
* etc/NEWS: Document this.
* lisp/comint.el (comint-exec-1):
* lisp/net/tramp-sh.el (tramp-remote-process-environment):
* lisp/progmodes/compile.el (compilation-start):
Don’t set EMACS=t in the subsidiary process.

3 files changed, 0 insertions, 16 deletions

diff --git a/lisp/comint.el b/lisp/comint.el
index cb79c175f0e..dcd4a5ae4cf 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -816,13 +816,6 @@ series of processes in the same Comint buffer.  The hook
                     (format "COLUMNS=%d" (window-width)))
             (list "TERM=emacs"
                   (format "TERMCAP=emacs:co#%d:tc=unknown:" (window-width))))
-
-          ;; This hack is for backward compatibility with Bash 4.3 and
-          ;; earlier.  It can break common uses of 'configure', so
-          ;; remove it once Bash 4.4 or later is common.
-          (unless (getenv "EMACS")
-            (list "EMACS=t"))
-
           (list (format "INSIDE_EMACS=%s,comint" emacs-version))
           process-environment))
         (default-directory
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 79ff1bea4c2..4d529f7aa32 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -520,7 +520,6 @@ as given in your `~/.profile'."
 (defcustom tramp-remote-process-environment
   `("TMOUT=0" "LC_CTYPE=''"
     ,(format "TERM=%s" tramp-terminal-type)
-    "EMACS=t" ;; Deprecated; remove this line once Bash 4.4-or-later is common.
     ,(format "INSIDE_EMACS='%s,tramp:%s'" emacs-version tramp-version)
     "CDPATH=" "HISTORY=" "MAIL=" "MAILCHECK=" "MAILPATH=" "PAGER=cat"
     "autocorrect=" "correct=")
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 0b15a283090..b7ab408f744 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1702,14 +1702,6 @@ Returns the compilation buffer created."
                 (list "TERM=emacs"
                       (format "TERMCAP=emacs:co#%d:tc=unknown:"
                               (window-width))))
-
-              ;; Set the EMACS variable, but
-              ;; don't override users' setting of $EMACS.
-              ;; Remove this hack once Bash 4.4-or-later is common,
-              ;; since it can break 'configure'.
-              (unless (getenv "EMACS")
-                (list "EMACS=t"))
-
               (list (format "INSIDE_EMACS=%s,compile" emacs-version))
               (copy-sequence process-environment))))
         (set (make-local-variable 'compilation-arguments)