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

e2c3f530 · Stefan Monnier · 37c0347e · e2c3f530 · e2c3f530
Commit e2c3f530 authored Sep 19, 2010 by Stefan Monnier
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

lisp/ChangeLog lisp/ChangeLog +2 -0

lisp/frame.el lisp/frame.el +4 -3

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
 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.


--- 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)