[Emacs-diffs] emacs/lisp ChangeLog frame.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/06/04 14:46:27

Modified files:
        lisp           : ChangeLog frame.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15664&r2=1.15665
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/frame.el?cvsroot=emacs&r1=1.298&r2=1.299

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15664
retrieving revision 1.15665
diff -u -b -r1.15664 -r1.15665
--- ChangeLog   4 Jun 2009 06:40:13 -0000       1.15664
+++ ChangeLog   4 Jun 2009 14:46:23 -0000       1.15665
@@ -1,3 +1,8 @@
+2009-06-04  Stefan Monnier  <address@hidden>
+
+       * frame.el (delete-other-frames): Only delete frames on the
+       same terminal (bug#3442).
+
 2009-06-04  Glenn Morris  <address@hidden>
 
        * calendar/solar.el (solar-n-hemi-seasons, solar-s-hemi-seasons):

Index: frame.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/frame.el,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -b -r1.298 -r1.299
--- frame.el    14 May 2009 03:50:57 -0000      1.298
+++ frame.el    4 Jun 2009 14:46:27 -0000       1.299
@@ -1485,6 +1485,10 @@
     (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.