* lisp/window.el (window-deletable-p): Use next-frame.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f543bd0eb03344abd149f0a04ea45c208db3b825..73384823c489365b54378596c9f8b9e119ba35b4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-13  Chong Yidong  <cyd@stupidchicken.com>
+
+       * window.el (window-deletable-p): Use next-frame.
+
 2011-09-13  Martin Rudalics  <rudalics@gmx.at>
 
        * window.el (window-auto-delete): Remove.

diff --git a/lisp/window.el b/lisp/window.el
index 26d29db499349ce9688058c601c01f95ad4eda07..3a229a4e44718110872ab896f8eaad344a161c44 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -2274,15 +2274,10 @@ frame."
         (buffer (window-buffer window)))
     (cond
      ((frame-root-window-p window)
-      ;; WINDOW's frame can be deleted only if there are other visible
-      ;; frames on the same terminal.
-      (when (let ((terminal (frame-terminal frame)))
-             (catch 'found
-               (dolist (f (delq frame (frame-list)))
-                 (and (eq terminal (frame-terminal f))
-                      (frame-visible-p f)
-                      (throw 'found t)))))
-          'frame))
+      ;; WINDOW's frame can be deleted only if there are other frames
+      ;; on the same terminal.
+      (unless (eq frame (next-frame frame 0))
+       'frame))
      ((or ignore-window-parameters
          (not (eq (window-parameter window 'window-side) 'none))
          (and parent (eq (window-parameter parent 'window-side) 'none)))