[Emacs-diffs] /srv/bzr/emacs/trunk r104654: Fix last fix of display-buffer-normalize-options.

[martin rudalics]

------------------------------------------------------------
revno: 104654
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Tue 2011-06-21 10:51:30 +0200
message:
  Fix last fix of display-buffer-normalize-options.
modified:
  lisp/window.el

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2011-06-21 08:29:43 +0000
+++ b/lisp/window.el    2011-06-21 08:51:30 +0000
@@ -5437,11 +5437,12 @@
       ;; `pop-up-frames', `display-buffer-reuse-frames', and
       ;; `last-nonminibuffer-frame' set means search for a window shoing
       ;; the same buffer of another frame.
-      (let ((frames (or (last-nonminibuffer-frame)
-                       (and (or use-pop-up-frames
-                                display-buffer-reuse-frames)
+      (let ((frames (or (and (or use-pop-up-frames
+                                display-buffer-reuse-frames
+                                (not (last-nonminibuffer-frame)))
                             ;; All visible or iconfied frames.
-                            0))))
+                            0)
+                       (last-nonminibuffer-frame))))
        (when frames
          (setq specifiers
                (cons (list 'reuse-window 'other 'same frames)