summaryrefslogtreecommitdiff
path: root/lisp/comint.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1995-10-22 16:56:46 +0000
committerRichard M. Stallman <rms@gnu.org>1995-10-22 16:56:46 +0000
commitf3b0a4316981e6b1f6c2cec3731a228e10d6ae37 (patch)
treef14e714c224def25429ba69cf6175455a818a77c /lisp/comint.el
parent3446af9c77122891a2267b7cf185c98118dda4fa (diff)
downloademacs-f3b0a4316981e6b1f6c2cec3731a228e10d6ae37.tar.gz
(comint-exec-1): Don't alter EMACS envvar if it's already defined.
Diffstat (limited to 'lisp/comint.el')
-rw-r--r--lisp/comint.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/comint.el b/lisp/comint.el
index e4ff700ad74..4d5d1a14bfe 100644
--- 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)