Fix last fix of display-buffer-normalize-options.

diff --git a/lisp/window.el b/lisp/window.el
index 605370aa1761841732bc2a958fda71f58cee6c1d..4c56d7ffe11bfadb5520737a9e538a963ee739ab 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5437,11 +5437,12 @@ options."
       ;; `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)