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

[Stefan Monnier]

Index: emacs/lisp/progmodes/compile.el
diff -c emacs/lisp/progmodes/compile.el:1.272 
emacs/lisp/progmodes/compile.el:1.273
*** emacs/lisp/progmodes/compile.el:1.272       Tue May  6 13:35:37 2003
--- emacs/lisp/progmodes/compile.el     Tue May 13 17:37:28 2003
***************
*** 1,6 ****
  ;;; compile.el --- run compiler as inferior of Emacs, parse error messages
  
! ;; Copyright (C) 1985, 86, 87, 93, 94, 95, 96, 97, 98, 1999, 2001
  ;;  Free Software Foundation, Inc.
  
  ;; Author: Roland McGrath <address@hidden>
--- 1,6 ----
  ;;; compile.el --- run compiler as inferior of Emacs, parse error messages
  
! ;; Copyright (C) 1985, 86, 87, 93, 94, 95, 96, 97, 98, 1999, 2001, 2003
  ;;  Free Software Foundation, Inc.
  
  ;; Author: Roland McGrath <address@hidden>
***************
*** 1051,1058 ****
          (goto-char (point-max)))
        ;; Pop up the compilation buffer.
        (setq outwin (display-buffer outbuf nil t))
!       (save-excursion
!       (set-buffer outbuf)
        (compilation-mode name-of-mode)
        ;; In what way is it non-ergonomic ?  -stef
        ;; (toggle-read-only 1) ;;; Non-ergonomic.
--- 1051,1057 ----
          (goto-char (point-max)))
        ;; Pop up the compilation buffer.
        (setq outwin (display-buffer outbuf nil t))
!       (with-current-buffer outbuf
        (compilation-mode name-of-mode)
        ;; In what way is it non-ergonomic ?  -stef
        ;; (toggle-read-only 1) ;;; Non-ergonomic.
***************
*** 1144,1162 ****
         ;; If window is alone in its frame, aside from a minibuffer,
         ;; don't change its height.
         (not (eq window (frame-root-window (window-frame window))))
!        ;; This save-excursion prevents us from changing the current buffer,
!        ;; which might not be the same as the selected window's buffer.
!        (save-excursion
!        (let ((w (selected-window)))
!          (unwind-protect
!              (progn
!                (select-window window)
!                (enlarge-window (- compilation-window-height
!                                   (window-height))))
!            ;; The enlarge-window above may have deleted W, if
!            ;; compilation-window-height is large enough.
!            (when (window-live-p w)
!              (select-window w)))))))
  
  (defvar compilation-menu-map
    (let ((map (make-sparse-keymap "Errors")))
--- 1143,1155 ----
         ;; If window is alone in its frame, aside from a minibuffer,
         ;; don't change its height.
         (not (eq window (frame-root-window (window-frame window))))
!        ;; This save-current-buffer prevents us from changing the current
!        ;; buffer, which might not be the same as the selected window's buffer.
!        (save-current-buffer
!        (save-selected-window
!          (select-window window)
!          (enlarge-window (- compilation-window-height
!                             (window-height)))))))
  
  (defvar compilation-menu-map
    (let ((map (make-sparse-keymap "Errors")))