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

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     07/12/28 22:26:14

Index: lisp/progmodes/compile.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/compile.el,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -b -r1.447 -r1.448
--- lisp/progmodes/compile.el   19 Dec 2007 02:54:53 -0000      1.447
+++ lisp/progmodes/compile.el   28 Dec 2007 22:26:12 -0000      1.448
@@ -1163,10 +1163,6 @@
                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.
-    (if (eq outbuf (current-buffer))
-       (goto-char (point-max)))
     ;; Pop up the compilation buffer.
     ;; http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01638.html
     (setq outwin (display-buffer outbuf))
@@ -1192,10 +1188,18 @@
        (set (make-local-variable 'revert-buffer-function)
             'compilation-revert-buffer)
        (set-window-start outwin (point-min))
-       (or (eq outwin (selected-window))
-           (set-window-point outwin (if compilation-scroll-output
-                                        (point)
+
+       ;; Position point as the user will see it.
+       (let ((desired-visible-point
+              ;; Put it at the end if `compilation-scroll-output' is set.
+              (if compilation-scroll-output
+                  (point-max)
+                ;; Normally put it at the top.
                                       (point-min))))
+         (if (eq outwin (selected-window))
+             (goto-char desired-visible-point)
+           (set-window-point outwin desired-visible-point)))
+
        ;; The setup function is called before compilation-set-window-height
        ;; so it can set the compilation-window-height buffer locally.
        (if compilation-process-setup-function
@@ -1219,7 +1223,10 @@
          (setq mode-line-process '(":%s"))
          (set-process-sentinel proc 'compilation-sentinel)
          (set-process-filter proc 'compilation-filter)
-         (set-marker (process-mark proc) (point) outbuf)
+         ;; Use (point-max) here so that output comes in
+         ;; after the initial text,
+         ;; regardless of where the user sees point.
+         (set-marker (process-mark proc) (point-max) outbuf)
          (when compilation-disable-input
            (condition-case nil
                (process-send-eof proc)