diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-09-19 11:53:28 +0200 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-09-19 11:53:28 +0200 |
| commit | e2c3f530ff6fff5f5276ebc4db1e93a967eca351 (patch) | |
| tree | 3ef36245a0465d5ab12eddf0536e6c63917e0216 /lisp | |
| parent | 37c0347eb5a2e197c747a6a11e452041acbe28b3 (diff) | |
| download | emacs-e2c3f530ff6fff5f5276ebc4db1e93a967eca351.tar.gz | |
* lisp/frame.el (make-frame-names-alist): Don't list frames on other displays.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/frame.el | 7 |
2 files changed, 6 insertions, 3 deletions
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) |