(compile-internal): If EMACS is already

defined in the environment, don't override its value.

2 files changed, 10 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 576505db8d8..1bd3dab563b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-23  Eli Zaretskii  <eliz@is.elta.co.il>
+
+        * progmodes/compile.el (compile-internal): If EMACS is already
+        defined in the environment, don't override its value.
+
 2001-07-23  Gerd Moellmann  <gerd@gnu.org>
 
         * play/fortune.el: Undo change of 2001-07-13.
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index cc899ba20a6..0e9f6f715a4 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -805,7 +805,11 @@ Returns the compilation buffer created."
             (funcall compilation-process-setup-function))
         ;; Start the compilation.
         (if (fboundp 'start-process)
-            (let* ((process-environment (cons "EMACS=t" process-environment))
+            (let* ((process-environment
+                    ;; Don't override users' setting of $EMACS.
+                    (if (getenv "EMACS")
+                        process-environment
+                      (cons "EMACS=t" process-environment)))
                    (proc (start-process-shell-command (downcase mode-name)
                                                       outbuf
                                                       command)))