From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 4 Jun 2009 14:46:23 +0000 (+0000)
Subject: (delete-other-frames): Only delete frames on the
X-Git-Tag: emacs-pretest-23.0.95~139
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5e5ae184f41162f3bc8fa5eb05833aaa54bd7ad7;p=emacs.git

(delete-other-frames): Only delete frames on the
same terminal (bug#3442).
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 24308678387..d21902e9ef5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* frame.el (delete-other-frames): Only delete frames on the
+	same terminal (bug#3442).
+
 2009-06-04  Glenn Morris  <rgm@gnu.org>
 
 	* calendar/solar.el (solar-n-hemi-seasons, solar-s-hemi-seasons):
diff --git a/lisp/frame.el b/lisp/frame.el
index d39eb80d3dd..549fb8933d5 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1485,6 +1485,10 @@ left untouched.  FRAME nil or omitted means use the selected frame."
     (setq frame (selected-frame)))
   (let* ((mini-frame (window-frame (minibuffer-window frame)))
 	 (frames (delq mini-frame (delq frame (frame-list)))))
+    ;; Only consider frames on the same terminal.
+    (dolist (frame (prog1 frames (setq frames nil)))
+      (if (eq (frame-terminal) (frame-terminal frame))
+          (push frame frames)))
     ;; Delete mon-minibuffer-only frames first, because `delete-frame'
     ;; signals an error when trying to delete a mini-frame that's
     ;; still in use by another frame.