Re: incomplete fix in EMACS_21_1_RC branch of progmodes/compile.el

[Ivan Zakharyaschev <imz@altlinux.org>]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 400 bytes --]

	Hello!

On Tue, 1 Oct 2002, Richard Stallman wrote:

> Can you send me the requisite patch to put into RC?

Here it is: the eqivalent of the diff from revision 1.246 to 1.248 of
progmodes/compile.el for the RC branch. (It sets the environment
_before_ starting the process.)

Regards,

-- 
Ivan Zakharyaschev
ALT Linux Team member, Sisyphus developer
http://www.altlinux.ru, http://www.altlinux.com

[-- Attachment #2: equiv of diff 1.246 -> 1.248 --]
[-- Type: TEXT/PLAIN, Size: 1682 bytes --]

--- emacs/emacs/lisp/progmodes/compile.RC.el	Tue Oct  1 23:11:17 2002
+++ emacs/emacs/lisp/progmodes/compile.el	Tue Oct  1 23:20:49 2002
@@ -826,24 +826,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
-	      (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.
-	      (or (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)