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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f53ca2b8f3c79bd9ca4cfde45267ba760ea8d4e6..912626f58639607ff4a8611607d36d2d8ffd2b9d 100644 (file)
--- 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 7a12c9fc2e0a740c797d861d1c9876caf576c944..44ac5c0e81db5504d07f2d298b91d04e20cbdd68 100644 (file)
--- 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)