# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1128223998 0
# Node ID a2cbf1cc9c6dfa1d3f2a4436b0209221e6dbf60f
# Parent  d88ec92a0f15e12534c818695188e5efbb759547
(compilation-buffer-name): New arg MODE-COMMAND.
(compilation-start): Pass new arg to compilation-buffer-name.
(compile-goto-error): Use next-error-internal.

diff -r d88ec92a0f15 -r a2cbf1cc9c6d lisp/progmodes/compile.el
--- a/lisp/progmodes/compile.el	Sun Oct 02 03:33:02 2005 +0000
+++ b/lisp/progmodes/compile.el	Sun Oct 02 03:33:18 2005 +0000
@@ -899,19 +899,20 @@
   :group 'compilation)
 
 
-(defun compilation-buffer-name (mode-name name-function)
+(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 in Compilation mode for the same mode name
+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))
-	((eq major-mode (nth 1 compilation-arguments))
+	((and (eq mode-command major-mode)
+	      (eq major-mode (nth 1 compilation-arguments)))
 	 (buffer-name))
 	(t
 	 (concat "*" (downcase mode-name) "*"))))
@@ -960,7 +961,7 @@
     (with-current-buffer
 	(setq outbuf
 	      (get-buffer-create
-	       (compilation-buffer-name name-of-mode name-function)))
+	       (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,7 +1553,7 @@
       (dired-other-window (car (get-text-property (point) 'directory)))
     (push-mark)
     (setq compilation-current-error (point))
-    (next-error 0)))
+    (next-error-internal))))
 
 ;; Return a compilation buffer.
 ;; If the current buffer is a compilation buffer, return it.