[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.356 
emacs/lisp/progmodes/compile.el:1.357
*** emacs/lisp/progmodes/compile.el:1.356       Thu May 19 16:48:28 2005
--- emacs/lisp/progmodes/compile.el     Sun May 29 08:32:57 2005
***************
*** 935,946 ****
                    (substitute-env-vars (match-string 1 command))
                  "~")
              default-directory))
        (erase-buffer)
!       ;; output a mode setter, for saving and later reloading this buffer
        (insert "-*- mode: " name-of-mode
                "; default-directory: " (prin1-to-string default-directory)
!               " -*-\n" command "\n")
!       (setq thisdir default-directory))
        (set-buffer-modified-p nil))
      ;; If we're already in the compilation buffer, go to the end
      ;; of the buffer, so point will track the compilation output.
--- 935,954 ----
                    (substitute-env-vars (match-string 1 command))
                  "~")
              default-directory))
+       ;; Select the desired mode.
+       (if (not (eq mode t))
+           (funcall mode)
+         (setq buffer-read-only nil)
+         (with-no-warnings (comint-mode))
+         (compilation-shell-minor-mode))
+       (if highlight-regexp
+           (set (make-local-variable 'compilation-highlight-regexp)
+                highlight-regexp))
        (erase-buffer)
!       ;; Output a mode setter, for saving and later reloading this buffer.
        (insert "-*- mode: " name-of-mode
                "; default-directory: " (prin1-to-string default-directory)
!               " -*-\n" command "\n")  (setq thisdir default-directory))
        (set-buffer-modified-p nil))
      ;; If we're already in the compilation buffer, go to the end
      ;; of the buffer, so point will track the compilation output.
***************
*** 963,976 ****
              ;; don't override users' setting of $EMACS.
              (unless (getenv "EMACS") '("EMACS=t"))
              (copy-sequence process-environment))))
-       (if (not (eq mode t))
-           (funcall mode)
-         (setq buffer-read-only nil)
-         (with-no-warnings (comint-mode))
-         (compilation-shell-minor-mode))
-       (if highlight-regexp
-           (set (make-local-variable 'compilation-highlight-regexp)
-                highlight-regexp))
        (set (make-local-variable 'compilation-arguments)
             (list command mode name-function highlight-regexp))
        (set (make-local-variable 'revert-buffer-function)
--- 971,976 ----