[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.385 
emacs/lisp/progmodes/compile.el:1.386
*** emacs/lisp/progmodes/compile.el:1.385       Thu Sep 29 22:57:28 2005
--- emacs/lisp/progmodes/compile.el     Sun Oct  2 03:33:18 2005
***************
*** 899,917 ****
    :group 'compilation)
  
  
! (defun compilation-buffer-name (mode-name name-function)
    "Return the name of a compilation buffer to use.
  If NAME-FUNCTION is non-nil, call it with one argument MODE-NAME
  to determine the buffer name.
  Likewise if `compilation-buffer-name-function' is non-nil.
! If current buffer is in Compilation mode for the same mode name
  return the name of the current buffer, so that it gets reused.
  Otherwise, construct a buffer name from MODE-NAME."
    (cond (name-function
         (funcall name-function mode-name))
        (compilation-buffer-name-function
         (funcall compilation-buffer-name-function mode-name))
!       ((eq major-mode (nth 1 compilation-arguments))
         (buffer-name))
        (t
         (concat "*" (downcase mode-name) "*"))))
--- 899,918 ----
    :group 'compilation)
  
  
! (defun compilation-buffer-name (mode-name mode-command name-function)
    "Return the name of a compilation buffer to use.
  If NAME-FUNCTION is non-nil, call it with one argument MODE-NAME
  to determine the buffer name.
  Likewise if `compilation-buffer-name-function' is non-nil.
! If current buffer is the mode MODE-COMMAND,
  return the name of the current buffer, so that it gets reused.
  Otherwise, construct a buffer name from MODE-NAME."
    (cond (name-function
         (funcall name-function mode-name))
        (compilation-buffer-name-function
         (funcall compilation-buffer-name-function mode-name))
!       ((and (eq mode-command major-mode)
!             (eq major-mode (nth 1 compilation-arguments)))
         (buffer-name))
        (t
         (concat "*" (downcase mode-name) "*"))))
***************
*** 960,966 ****
      (with-current-buffer
        (setq outbuf
              (get-buffer-create
!              (compilation-buffer-name name-of-mode name-function)))
        (let ((comp-proc (get-buffer-process (current-buffer))))
        (if comp-proc
            (if (or (not (eq (process-status comp-proc) 'run))
--- 961,967 ----
      (with-current-buffer
        (setq outbuf
              (get-buffer-create
!              (compilation-buffer-name name-of-mode mode name-function)))
        (let ((comp-proc (get-buffer-process (current-buffer))))
        (if comp-proc
            (if (or (not (eq (process-status comp-proc) 'run))
***************
*** 1552,1558 ****
        (dired-other-window (car (get-text-property (point) 'directory)))
      (push-mark)
      (setq compilation-current-error (point))
!     (next-error 0)))
  
  ;; Return a compilation buffer.
  ;; If the current buffer is a compilation buffer, return it.
--- 1553,1559 ----
        (dired-other-window (car (get-text-property (point) 'directory)))
      (push-mark)
      (setq compilation-current-error (point))
!     (next-error-internal))))
  
  ;; Return a compilation buffer.
  ;; If the current buffer is a compilation buffer, return it.