diff options
author | martin rudalics <rudalics@gmx.at> | 2011-06-16 11:21:56 +0200 |
---|---|---|
committer | martin rudalics <rudalics@gmx.at> | 2011-06-16 11:21:56 +0200 |
commit | e1d6fd604fb9601680050f9fc6366690eca2b96f (patch) | |
tree | 05d24f0845e80223ba744ff5b587ee13c19932f6 /lisp/window.el | |
parent | 5ffe19c00b7a06dcb910111fc907c5df08060aff (diff) | |
download | emacs-e1d6fd604fb9601680050f9fc6366690eca2b96f.tar.gz |
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).
Diffstat (limited to 'lisp/window.el')
-rw-r--r-- | lisp/window.el | 7 |
1 files changed, 4 insertions, 3 deletions
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. SPECIFIERS must be a list of buffer display specifiers, see the documentation of `display-buffer-alist' for a description." - (unless (and graphic-only (not (display-graphic-p))) + (unless (or (and graphic-only (not (display-graphic-p))) + noninteractive) (let* ((selected-window (selected-window)) (function (or (cdr (assq 'pop-up-frame-function specifiers)) 'make-frame)) @@ -5299,8 +5300,8 @@ this list as arguments." ;; Try reusing a window not showing BUFFER on any visible or ;; iconified frame. (display-buffer-reuse-window buffer '(nil other 0)) - ;; Try making a new frame (but not in batch mode). - (and (not noninteractive) (display-buffer-pop-up-frame buffer)) + ;; Try making a new frame. + (display-buffer-pop-up-frame buffer) ;; Try using a weakly dedicated window. (display-buffer-reuse-window buffer '(nil nil t) '((reuse-window-dedicated . weak))) |