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

[Daniel Pfeiffer]

Index: emacs/lisp/progmodes/compile.el
diff -c emacs/lisp/progmodes/compile.el:1.320 
emacs/lisp/progmodes/compile.el:1.321
*** emacs/lisp/progmodes/compile.el:1.320       Fri May 28 21:11:41 2004
--- emacs/lisp/progmodes/compile.el     Tue Jun  8 21:36:37 2004
***************
*** 210,216 ****
  
      (gnu
       "^\\(?:[[:alpha:]][-[:alnum:].]+: ?\\)?\
! \\([/.]*[a-zA-Z]:?[^ \t\n:]*\\): ?\
  \\([0-9]+\\)\\([.:]?\\)\\([0-9]+\\)?\
  \\(?:-\\(?:\\([0-9]+\\)\\3\\)?\\.?\\([0-9]+\\)?\\)?:\
  \\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\)\\|\
--- 210,216 ----
  
      (gnu
       "^\\(?:[[:alpha:]][-[:alnum:].]+: ?\\)?\
! \\([/.]*[a-zA-Z]:?[^ \t\n:]*\\|{standard input}\\): ?\
  \\([0-9]+\\)\\([.:]?\\)\\([0-9]+\\)?\
  \\(?:-\\(?:\\([0-9]+\\)\\3\\)?\\.?\\([0-9]+\\)?\\)?:\
  \\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\)\\|\
***************
*** 242,248 ****
  : \\(?:error\\|warnin\\(g\\)\\) C[0-9]+:" 1 2 nil (3))
  
      (oracle
!      "^Semantic error at line \\([0-9]+\\), column \\([0-9]+\\), file 
\\(.*\\):$"
       3 1 2)
  
      (perl
--- 242,250 ----
  : \\(?:error\\|warnin\\(g\\)\\) C[0-9]+:" 1 2 nil (3))
  
      (oracle
!      "^\\(?:Semantic error\\|Error\\|PCC-[0-9]+:\\).* line \\([0-9]+\\)\
! \\(?:\\(?:,\\| at\\)? column \\([0-9]+\\)\\)?\
! \\(?:,\\| in\\| of\\)? file \\(.*?\\):?$"
       3 1 2)
  
      (perl
***************
*** 988,1000 ****
         ;; 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
!            (save-excursion
!              (select-window window)
!              (enlarge-window (- height (window-height)))))))))
  
  (defvar compilation-menu-map
    (let ((map (make-sparse-keymap "Errors")))
--- 990,1000 ----
         ;; 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))))
!        ;; Stef said that doing the saves in this order is safer:
!        (save-excursion
           (save-selected-window
!            (select-window window)
!            (enlarge-window (- height (window-height))))))))
  
  (defvar compilation-menu-map
    (let ((map (make-sparse-keymap "Errors")))