[Emacs-diffs] /srv/bzr/emacs/trunk r104605: Never ever pop up a new frame in noninteractive mode (bug#8857).

[martin rudalics]

------------------------------------------------------------
revno: 104605
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Thu 2011-06-16 11:21:56 +0200
message:
  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).
modified:
  lisp/ChangeLog
  lisp/window.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-06-16 08:55:08 +0000
+++ b/lisp/ChangeLog    2011-06-16 09:21:56 +0000
@@ -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  <address@hidden>
 

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2011-06-16 08:55:08 +0000
+++ b/lisp/window.el    2011-06-16 09:21:56 +0000
@@ -4704,7 +4704,8 @@
 
 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 @@
          ;; 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)))