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

f3b0a431 · Richard M. Stallman · 3446af9c · f3b0a431
Commit f3b0a431 authored Oct 22, 1995 by Richard M. Stallman
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

lisp/comint.el lisp/comint.el +3 -2

No files found.
--- 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)