(comint-exec-1): Don't alter EMACS envvar if it's already defined.

diff --git a/lisp/comint.el b/lisp/comint.el
index e4ff700ad74e256dc56b9b842d6b78e69459905b..4d5d1a14bfe0979d6b3562bfefe4f3e19536e6eb 100644 (file)
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -587,10 +587,11 @@ buffer.  The hook `comint-exec-hook' is run after each exec."
          ;; Some programs that use terminfo get very confused
          ;; if TERM is not a valid terminal type.
          (if (and (boundp 'system-uses-terminfo) system-uses-terminfo)
-             (list "EMACS=t" "TERM=unknown"
+             (list "TERM=unknown"
                    (format "COLUMNS=%d" (frame-width)))
-           (list "EMACS=t" "TERM=emacs"
+           (list "TERM=emacs"
                  (format "TERMCAP=emacs:co#%d:tc=unknown:" (frame-width))))
+         (if (getenv "EMACS") nil (list "EMACS=t"))
          process-environment))
        (default-directory
          (if (file-directory-p default-directory)