[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#13594: 24.2.92; [PATCH] compilation-start doesn't consider nil OUTWI
From: |
Leo Liu |
Subject: |
bug#13594: 24.2.92; [PATCH] compilation-start doesn't consider nil OUTWIN |
Date: |
Thu, 31 Jan 2013 20:35:23 +0800 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.2.92 (OS X 10.8.2) |
On 2013-01-31 18:43 +0800, Leo Liu wrote:
> (proposed patch attached)
All three instances of display-buffer in compile fails to account for
nil value. The following patch fix them all.
lisp/progmodes/compile.el | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
Modified lisp/progmodes/compile.el
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index f383e02b..09a2d9a2 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1616,7 +1616,7 @@ (defun compilation-start (command &optional mode
name-function highlight-regexp)
(set-buffer-modified-p nil))
;; Pop up the compilation buffer.
;; http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01638.html
- (setq outwin (display-buffer outbuf))
+ (setq outwin (display-buffer outbuf)) ; Note: OUTWIN may be nil
(with-current-buffer outbuf
(let ((process-environment
(append
@@ -1638,7 +1638,7 @@ (defun compilation-start (command &optional mode
name-function highlight-regexp)
(list command mode name-function highlight-regexp))
(set (make-local-variable 'revert-buffer-function)
'compilation-revert-buffer)
- (set-window-start outwin (point-min))
+ (and outwin (set-window-start outwin (point-min)))
;; Position point as the user will see it.
(let ((desired-visible-point
@@ -1647,15 +1647,16 @@ (defun compilation-start (command &optional mode
name-function highlight-regexp)
(point-max)
;; Normally put it at the top.
(point-min))))
- (if (eq outwin (selected-window))
- (goto-char desired-visible-point)
- (set-window-point outwin desired-visible-point)))
+ (when outwin
+ (if (eq outwin (selected-window))
+ (goto-char desired-visible-point)
+ (set-window-point outwin desired-visible-point))))
;; The setup function is called before compilation-set-window-height
;; so it can set the compilation-window-height buffer locally.
(if compilation-process-setup-function
(funcall compilation-process-setup-function))
- (compilation-set-window-height outwin)
+ (and outwin (compilation-set-window-height outwin))
;; Start the compilation.
(if (fboundp 'start-process)
(let ((proc
@@ -2490,11 +2491,12 @@ (defun compilation-goto-locus (msg mk end-mk)
(display-buffer (marker-buffer msg))))
(highlight-regexp (with-current-buffer (marker-buffer msg)
;; also do this while we change buffer
- (compilation-set-window w msg)
+ (and w (compilation-set-window w msg))
compilation-highlight-regexp)))
;; Ideally, the window-size should be passed to `display-buffer'
;; so it's only used when creating a new window.
- (unless pre-existing (compilation-set-window-height w))
+ (when (and (not pre-existing) w)
+ (compilation-set-window-height w))
(if from-compilation-buffer
;; If the compilation buffer window was selected,
@@ -2605,9 +2607,9 @@ (defun compilation-find-file (marker filename directory
&rest formats)
(while (null buffer) ;Repeat until the user selects an existing file.
;; The file doesn't exist. Ask the user where to find it.
(save-excursion ;This save-excursion is probably not right.
- (let ((pop-up-windows t))
- (compilation-set-window (display-buffer (marker-buffer marker))
- marker)
+ (let* ((pop-up-windows t)
+ (w (display-buffer (marker-buffer marker))))
+ (and w (compilation-set-window w marker))
(let* ((name (read-file-name
(format "Find this %s in (default %s): "
compilation-error filename)