Don't let display-buffer pop up new frames by default (bug#8857).

* window.el (display-buffer-alist): Trim default value to avoid
popping up a new frame (Bug#8857) or reusing an arbitrary window
on another frame.
(display-buffer): Do not fall back on popping up a new frame in
batch mode (Bug#8857).

2 files changed, 13 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2cf968505af..d4b554464a7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2011-06-15  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer-alist): Trim default value to avoid
+        popping up a new frame (Bug#8857) or reusing an arbitrary window
+        on another frame.
+        (display-buffer): Do not fall back on popping up a new frame in
+        batch mode (Bug#8857).
+
 2011-06-14  Chong Yidong  <cyd@stupidchicken.com>
 
         * cus-theme.el (describe-theme-1): Use custom-theme-p.
diff --git a/lisp/window.el b/lisp/window.el
index cad4e15507d..424ee11e2a5 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -3505,9 +3505,7 @@ buffer display specifiers.")
      reuse-window (reuse-window nil same visible)
      pop-up-window
      (pop-up-window (largest . nil) (lru . nil))
-     pop-up-frame
-     (pop-up-frame)
-     reuse-window (reuse-window nil other visible)
+     reuse-window (reuse-window other other nil)
      (reuse-window-even-sizes . t)))
   "List associating buffer identifiers with display specifiers.
 The car of each element of this list is built from a set of cons
@@ -5303,12 +5301,12 @@ 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.
-          (display-buffer-pop-up-frame buffer)
-          ;; Try using weakly dedicated windows.
+          ;; Try making a new frame (but not in batch mode).
+          (and (not noninteractive) (display-buffer-pop-up-frame buffer))
+          ;; Try using a weakly dedicated window.
           (display-buffer-reuse-window
            buffer '(nil nil t) '((reuse-window-dedicated . weak)))
-          ;; Try using strongly dedicated windows.
+          ;; Try using a strongly dedicated window.
           (display-buffer-reuse-window
            buffer '(nil nil t) '((reuse-window-dedicated . t)))))))