From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sun, 19 Sep 2010 09:53:28 +0000 (+0200)
Subject: * lisp/frame.el (make-frame-names-alist): Don't list frames on other displays.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~47^2~79
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e2c3f530ff6fff5f5276ebc4db1e93a967eca351;p=emacs.git

* lisp/frame.el (make-frame-names-alist): Don't list frames on other displays.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f53ca2b8f3c..912626f5863 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/frame.el b/lisp/frame.el
index 7a12c9fc2e0..44ac5c0e81d 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -907,15 +907,16 @@ Calls `suspend-emacs' if invoked from the controlling tty device,
      (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)