[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el, v [EMACS_22_BA
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el, v [EMACS_22_BASE] |
Date: |
Thu, 02 Aug 2007 17:39:28 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Branch: EMACS_22_BASE
Changes by: Richard M. Stallman <rms> 07/08/02 17:39:28
Index: compile.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/compile.el,v
retrieving revision 1.421.2.5
retrieving revision 1.421.2.6
diff -u -b -r1.421.2.5 -r1.421.2.6
--- compile.el 25 Jul 2007 04:29:36 -0000 1.421.2.5
+++ compile.el 2 Aug 2007 17:39:28 -0000 1.421.2.6
@@ -888,11 +888,13 @@
Additionally, with universal prefix arg, compilation buffer will be in
comint mode, i.e. interactive.
-To run more than one compilation at once, start one and rename
+To run more than one compilation at once, start one then rename
the \`*compilation*' buffer to some other name with
-\\[rename-buffer]. Then start the next one. On most systems,
-termination of the main compilation process kills its
-subprocesses.
+\\[rename-buffer]. Then _switch buffers_ and start the new compilation.
+It will create a new \`*compilation*' buffer.
+
+On most systems, termination of the main compilation process
+kills its subprocesses.
The name used for the buffer is actually whatever is returned by
the function in `compilation-buffer-name-function', so you can set that
@@ -944,7 +946,7 @@
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,
+If current buffer has the major 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
@@ -983,8 +985,11 @@
MODE is the major mode to set in the compilation buffer. Mode
may also be t meaning use `compilation-shell-minor-mode' under `comint-mode'.
+
If NAME-FUNCTION is non-nil, call it with one argument (the mode name)
-to determine the buffer name.
+to determine the buffer name. Otherwise, the default is to
+reuses the current buffer if it has the proper major mode,
+else use or create a buffer with name based on the major mode.
If HIGHLIGHT-REGEXP is non-nil, `next-error' will temporarily highlight
the matching section of the visited source line; the default is to use the
@@ -1604,12 +1609,16 @@
(setq compilation-current-error (point))
(next-error-internal)))
-;; Return a compilation buffer.
-;; If the current buffer is a compilation buffer, return it.
-;; Otherwise, look for a compilation buffer and signal an error
-;; if there are none.
(defun compilation-find-buffer (&optional avoid-current)
- (next-error-find-buffer avoid-current 'compilation-buffer-internal-p))
+ "Return a compilation buffer.
+If AVOID-CURRENT is nil, and
+the current buffer is a compilation buffer, return it.
+If AVOID-CURRENT is non-nil, return the current buffer
+only as a last resort."
+ (if (and (compilation-buffer-internal-p (current-buffer))
+ (not avoid-current))
+ (current-buffer)
+ (next-error-find-buffer avoid-current 'compilation-buffer-internal-p)))
;;;###autoload
(defun compilation-next-error-function (n &optional reset)
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el, v [EMACS_22_BASE],
Richard M. Stallman <=