2 files changed, 18 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5cb76a1394a..6a315d9751e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-13  Chong Yidong  <cyd@stupidchicken.com>
+
+        * window.el (window-deletable-p): Never delete the last frame on a
+        given terminal.
+
 2011-09-13  Glenn Morris  <rgm@gnu.org>
 
         * help.el (describe-key-briefly): Copy previous standard-output change.
diff --git a/lisp/window.el b/lisp/window.el
index e60cc4768b7..58b023163bd 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -2312,13 +2312,19 @@ its buffer or has no previous buffer to show instead."
                                  buffer))))))
     (cond
      ((frame-root-window-p window)
-      (when (and (or force dedicated
-                     (and (not prev) (memq window-auto-delete '(t frame))))
-                 (other-visible-frames-p frame))
-        ;; We can delete WINDOW's frame if (1) either FORCE is non-nil,
-        ;; WINDOW is dedicated to its buffer, or there are no previous
-        ;; buffers to show and (2) there are other visible frames left.
-        'frame))
+      ;; We can delete the frame if (1) FORCE is non-nil, WINDOW is
+      ;; dedicated to its buffer, or there are no previous buffers to
+      ;; show and (2) there are other visible frames on this terminal.
+      (and (or force dedicated
+               (and (not prev) (memq window-auto-delete '(t frame))))
+           ;; Are there visible frames on the same terminal?
+           (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))
      ((and (or force dedicated
                (and (not prev) (memq window-auto-delete '(t window))))
            (or ignore-window-parameters