changeset 42408:f8c910bc4ca1

(compile-internal): Fix previous change.
author Richard M. Stallman <rms@gnu.org>
date Sat, 29 Dec 2001 20:31:14 +0000
parents f2c23e762b64
children e4bc19536f88
files lisp/progmodes/compile.el
diffstat 1 files changed, 14 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/progmodes/compile.el	Sat Dec 29 20:12:45 2001 +0000
+++ b/lisp/progmodes/compile.el	Sat Dec 29 20:31:14 2001 +0000
@@ -899,25 +899,23 @@
 	    (funcall compilation-process-setup-function))
 	;; Start the compilation.
 	(if (fboundp 'start-process)
-	    (let* ((process-environment process-environment)
+ 	    (let* ((process-environment
+		    (append
+		     (if (and (boundp 'system-uses-terminfo)
+			      system-uses-terminfo)
+			 (list "TERM=dumb" "TERMCAP="
+			       (format "COLUMNS=%d" (window-width)))
+		       (list "TERM=emacs"
+			     (format "TERMCAP=emacs:co#%d:tc=unknown:"
+				     (window-width))))
+		     ;; Set the EMACS variable, but
+		     ;; 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)))
-	      ;; Set the terminal type.
-	      ;; There is similar code in comint.el.
-	      (setq process-environment
-		    (if (and (boundp 'system-uses-terminfo)
-			     system-uses-terminfo)
-			(list "TERM=dumb" "TERMCAP="
-			      (format "COLUMNS=%d" (window-width)))
-		      (list "TERM=emacs"
-			    (format "TERMCAP=emacs:co#%d:tc=unknown:"
-				    (window-width)))))
-	      ;; Set the EMACS variable, but
-	      ;; don't override users' setting of $EMACS.
-	      (if (getenv "EMACS")
-		  (setq process-environment
-			(cons "EMACS=t" process-environment)))
 	      (set-process-sentinel proc 'compilation-sentinel)
 	      (set-process-filter proc 'compilation-filter)
 	      (set-marker (process-mark proc) (point) outbuf)