[Emacs-diffs] /srv/bzr/emacs/trunk r105758: * lisp/window.el (window-deletable-p): Use next-frame.

[Chong Yidong]

------------------------------------------------------------
revno: 105758
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2011-09-13 15:10:32 -0400
message:
  * lisp/window.el (window-deletable-p): Use next-frame.
modified:
  lisp/ChangeLog
  lisp/window.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-13 18:07:11 +0000
+++ b/lisp/ChangeLog    2011-09-13 19:10:32 +0000
@@ -1,3 +1,7 @@
+2011-09-13  Chong Yidong  <address@hidden>
+
+       * window.el (window-deletable-p): Use next-frame.
+
 2011-09-13  Martin Rudalics  <address@hidden>
 
        * window.el (window-auto-delete): Remove.

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2011-09-13 18:07:11 +0000
+++ b/lisp/window.el    2011-09-13 19:10:32 +0000
@@ -2274,15 +2274,10 @@
         (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)))