diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-04-09 11:01:04 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-04-09 11:01:04 -0400 |
| commit | beaab898968caf8b243a33d24824d430fabc31fc (patch) | |
| tree | 6b20cee8a25d64a1d890a91e3cdefdf2010feef1 /lisp/progmodes | |
| parent | 6083965958381b29aa55948670d2b85289b0be6d (diff) | |
| download | emacs-beaab898968caf8b243a33d24824d430fabc31fc.tar.gz | |
Stop messing with the EMACS env var
Fixes: debbugs:20202
* lisp/net/tramp-sh.el (tramp-remote-process-environment):
* lisp/comint.el (comint-exec-1):
* lisp/term.el (term-exec-1): Don't set EMACS envvar.
* lisp/progmodes/compile.el (compilation-start): Same and bring
INSIDE_EMACS's format in line with other users.
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/compile.el | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 362bbf54c0b..9d36e91cf8f 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -1666,11 +1666,7 @@ 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. - (unless (getenv "EMACS") - (list "EMACS=t")) - (list "INSIDE_EMACS=t") + (list (format "INSIDE_EMACS=%s,compile" emacs-version)) (copy-sequence process-environment)))) (set (make-local-variable 'compilation-arguments) (list command mode name-function highlight-regexp)) |