[Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el

[Richard M. Stallman]

Index: emacs/lisp/progmodes/compile.el
diff -c emacs/lisp/progmodes/compile.el:1.247 
emacs/lisp/progmodes/compile.el:1.248
*** emacs/lisp/progmodes/compile.el:1.247       Wed Dec 26 16:27:20 2001
--- emacs/lisp/progmodes/compile.el     Sat Dec 29 15:31:14 2001
***************
*** 899,923 ****
            (funcall compilation-process-setup-function))
        ;; Start the compilation.
        (if (fboundp 'start-process)
!           (let* ((process-environment 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)
--- 899,921 ----
            (funcall compilation-process-setup-function))
        ;; Start the compilation.
        (if (fboundp 'start-process)
!           (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-process-sentinel proc 'compilation-sentinel)
              (set-process-filter proc 'compilation-filter)
              (set-marker (process-mark proc) (point) outbuf)