From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 12 Apr 2002 16:45:25 +0000 (+0000)
Subject: (compile-internal): Fix the change from 2001-07-23.
X-Git-Tag: emacs-pretest-21.2.91~314
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=63d178be33a087c228560600268370e548821fd6;p=emacs.git

(compile-internal): Fix the change from 2001-07-23.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ef5e373c62c..6f273a15128 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-12  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* progmodes/compile.el (compile-internal): Fix the change from
+	2001-07-23.
+
 2002-03-16  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* Version 21.2 released.
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index f49948d2333..0458c665c51 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -841,7 +841,7 @@ Returns the compilation buffer created."
 				    (window-width)))))
 	      ;; Set the EMACS variable, but
 	      ;; don't override users' setting of $EMACS.
-	      (if (getenv "EMACS")
+	      (or (getenv "EMACS")
 		  (setq process-environment
 			(cons "EMACS=t" process-environment)))
 	      (set-process-sentinel proc 'compilation-sentinel)