# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1284890008 -7200
# Node ID 1d2cc4dc816fb2ef1e746796b2b7641094d61d99
# Parent  cd8d9630f156aecb17f1e98c137bcaa1999cae6c
* lisp/frame.el (make-frame-names-alist): Don't list frames on other displays.

diff -r cd8d9630f156 -r 1d2cc4dc816f lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Sep 19 11:32:52 2010 +0200
+++ b/lisp/ChangeLog	Sun Sep 19 11:53:28 2010 +0200
@@ -1,5 +1,7 @@
 2010-09-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* frame.el (make-frame-names-alist): Don't list frames on other displays.
+
 	* fringe.el (fringe-styles): New var.
 	(fringe-mode, fringe-query-style): Use it.
 
diff -r cd8d9630f156 -r 1d2cc4dc816f lisp/frame.el
--- a/lisp/frame.el	Sun Sep 19 11:32:52 2010 +0200
+++ b/lisp/frame.el	Sun Sep 19 11:53:28 2010 +0200
@@ -907,15 +907,16 @@
      (t (suspend-emacs)))))
 
 (defun make-frame-names-alist ()
+  ;; Only consider the frames on the same display.
   (let* ((current-frame (selected-frame))
 	 (falist
 	  (cons
 	   (cons (frame-parameter current-frame 'name) current-frame) nil))
-	 (frame (next-frame nil t)))
+	 (frame (next-frame nil 0)))
     (while (not (eq frame current-frame))
       (progn
-	(setq falist (cons (cons (frame-parameter frame 'name) frame) falist))
-	(setq frame (next-frame frame t))))
+	(push (cons (frame-parameter frame 'name) frame) falist)
+	(setq frame (next-frame frame 0))))
     falist))
 
 (defvar frame-name-history nil)