[Emacs-diffs] /srv/bzr/emacs/trunk r101489: * lisp/frame.el (make-frame-names-alist): Don't list frames on other displays.

[Stefan Monnier]

------------------------------------------------------------
revno: 101489
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sun 2010-09-19 11:53:28 +0200
message:
  * lisp/frame.el (make-frame-names-alist): Don't list frames on other displays.
modified:
  lisp/ChangeLog
  lisp/frame.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-09-19 09:32:52 +0000
+++ b/lisp/ChangeLog    2010-09-19 09:53:28 +0000
@@ -1,5 +1,7 @@
 2010-09-19  Stefan Monnier  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/frame.el'
--- a/lisp/frame.el     2010-09-02 10:17:02 +0000
+++ b/lisp/frame.el     2010-09-19 09:53:28 +0000
@@ -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)