diff options
| author | Martin Rudalics | 2011-06-16 11:21:56 +0200 |
|---|---|---|
| committer | Martin Rudalics | 2011-06-16 11:21:56 +0200 |
| commit | 9c2755e9b449297d3eba5d2004dca16af6a13bab (patch) | |
| tree | 21eaef60d72cda90bf37606f3b44150c8ec2463b | |
| parent | 981d5c0932ed7a9cf66e48fb5d220151722a31c0 (diff) | |
| download | emacs-9c2755e9b449297d3eba5d2004dca16af6a13bab.tar.gz emacs-9c2755e9b449297d3eba5d2004dca16af6a13bab.zip | |
Never ever pop up a new frame in noninteractive mode (bug#8857).
(display-buffer): Don't check noninteractive when calling
display-buffer-pop-up-frame.
(display-buffer-pop-up-frame): Never pop up a frame in
noninteractive mode (Bug#8857).
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/window.el | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 92939d77fe4..77ee2fe27a6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -7,6 +7,10 @@ | |||
| 7 | (switch-to-buffer-other-window-same-frame) | 7 | (switch-to-buffer-other-window-same-frame) |
| 8 | (switch-to-buffer-other-frame): Fix doc-strings. Reported by Drew | 8 | (switch-to-buffer-other-frame): Fix doc-strings. Reported by Drew |
| 9 | Adams (Bug#8875). | 9 | Adams (Bug#8875). |
| 10 | (display-buffer): Don't check noninteractive when calling | ||
| 11 | display-buffer-pop-up-frame. | ||
| 12 | (display-buffer-pop-up-frame): Never pop up a frame in | ||
| 13 | noninteractive mode (Bug#8857). | ||
| 10 | 14 | ||
| 11 | 2011-06-15 Stefan Monnier <monnier@iro.umontreal.ca> | 15 | 2011-06-15 Stefan Monnier <monnier@iro.umontreal.ca> |
| 12 | 16 | ||
diff --git a/lisp/window.el b/lisp/window.el index 71723818794..5f9e761b3d7 100644 --- a/lisp/window.el +++ b/lisp/window.el | |||
| @@ -4704,7 +4704,8 @@ non-nil means to make a new frame on graphic displays only. | |||
| 4704 | 4704 | ||
| 4705 | SPECIFIERS must be a list of buffer display specifiers, see the | 4705 | SPECIFIERS must be a list of buffer display specifiers, see the |
| 4706 | documentation of `display-buffer-alist' for a description." | 4706 | documentation of `display-buffer-alist' for a description." |
| 4707 | (unless (and graphic-only (not (display-graphic-p))) | 4707 | (unless (or (and graphic-only (not (display-graphic-p))) |
| 4708 | noninteractive) | ||
| 4708 | (let* ((selected-window (selected-window)) | 4709 | (let* ((selected-window (selected-window)) |
| 4709 | (function (or (cdr (assq 'pop-up-frame-function specifiers)) | 4710 | (function (or (cdr (assq 'pop-up-frame-function specifiers)) |
| 4710 | 'make-frame)) | 4711 | 'make-frame)) |
| @@ -5299,8 +5300,8 @@ this list as arguments." | |||
| 5299 | ;; Try reusing a window not showing BUFFER on any visible or | 5300 | ;; Try reusing a window not showing BUFFER on any visible or |
| 5300 | ;; iconified frame. | 5301 | ;; iconified frame. |
| 5301 | (display-buffer-reuse-window buffer '(nil other 0)) | 5302 | (display-buffer-reuse-window buffer '(nil other 0)) |
| 5302 | ;; Try making a new frame (but not in batch mode). | 5303 | ;; Try making a new frame. |
| 5303 | (and (not noninteractive) (display-buffer-pop-up-frame buffer)) | 5304 | (display-buffer-pop-up-frame buffer) |
| 5304 | ;; Try using a weakly dedicated window. | 5305 | ;; Try using a weakly dedicated window. |
| 5305 | (display-buffer-reuse-window | 5306 | (display-buffer-reuse-window |
| 5306 | buffer '(nil nil t) '((reuse-window-dedicated . weak))) | 5307 | buffer '(nil nil t) '((reuse-window-dedicated . weak))) |