[Emacs-diffs] /srv/bzr/emacs/trunk r104585: Don't let display-buffer pop up new frames by default (bug#8857).

[martin rudalics]

------------------------------------------------------------
revno: 104585
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Wed 2011-06-15 09:09:47 +0200
message:
  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).
modified:
  lisp/ChangeLog
  lisp/window.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-06-14 05:06:26 +0000
+++ b/lisp/ChangeLog    2011-06-15 07:09:47 +0000
@@ -1,3 +1,11 @@
+2011-06-15  Martin Rudalics  <address@hidden>
+
+       * 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  <address@hidden>
 
        * cus-theme.el (describe-theme-1): Use custom-theme-p.

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2011-06-13 08:21:09 +0000
+++ b/lisp/window.el    2011-06-15 07:09:47 +0000
@@ -3505,9 +3505,7 @@
      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 @@
          ;; 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)))))))