From 9c2755e9b449297d3eba5d2004dca16af6a13bab Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Thu, 16 Jun 2011 11:21:56 +0200 Subject: [PATCH] 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). --- lisp/ChangeLog | 4 ++++ 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 @@ (switch-to-buffer-other-window-same-frame) (switch-to-buffer-other-frame): Fix doc-strings. Reported by Drew Adams (Bug#8875). + (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). 2011-06-15 Stefan Monnier 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))) -- 2.39.2