diff options
| author | Stephen Leake | 2018-12-23 10:23:26 -0800 |
|---|---|---|
| committer | Stephen Leake | 2018-12-23 10:23:26 -0800 |
| commit | 9578c2aa2201642e6846b0d09c14e72bc3225d09 (patch) | |
| tree | 3c4a0ad66be2d0eccc346b0202b08cda4673b154 | |
| parent | 0f9be72701b5cf03a5b1162c4bce2776a5d2ba81 (diff) | |
| download | emacs-9578c2aa2201642e6846b0d09c14e72bc3225d09.tar.gz emacs-9578c2aa2201642e6846b0d09c14e72bc3225d09.zip | |
Fix a simple bug in display-buffer-use-some-frame
* lisp/window.el (display-buffer-use-some-frame): Simplify the
predicate, fix TYPE arg to window--display-buffer.
| -rw-r--r-- | lisp/window.el | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/window.el b/lisp/window.el index f252b0e041a..d40e6c5c811 100644 --- a/lisp/window.el +++ b/lisp/window.el | |||
| @@ -7114,9 +7114,7 @@ that allows the selected frame)." | |||
| 7114 | (or (cdr (assq 'frame-predicate alist)) | 7114 | (or (cdr (assq 'frame-predicate alist)) |
| 7115 | (lambda (frame) | 7115 | (lambda (frame) |
| 7116 | (and (not (eq frame (selected-frame))) | 7116 | (and (not (eq frame (selected-frame))) |
| 7117 | (not (window-dedicated-p | 7117 | (get-lru-window frame))))) |
| 7118 | (or (get-lru-window frame) | ||
| 7119 | (frame-first-window frame)))))))) | ||
| 7120 | (frame (car (filtered-frame-list predicate))) | 7118 | (frame (car (filtered-frame-list predicate))) |
| 7121 | (window | 7119 | (window |
| 7122 | (and frame | 7120 | (and frame |
| @@ -7125,7 +7123,7 @@ that allows the selected frame)." | |||
| 7125 | (when window | 7123 | (when window |
| 7126 | (prog1 | 7124 | (prog1 |
| 7127 | (window--display-buffer | 7125 | (window--display-buffer |
| 7128 | buffer window 'frame alist display-buffer-mark-dedicated) | 7126 | buffer window 'reuse alist display-buffer-mark-dedicated) |
| 7129 | (unless (cdr (assq 'inhibit-switch-frame alist)) | 7127 | (unless (cdr (assq 'inhibit-switch-frame alist)) |
| 7130 | (window--maybe-raise-frame frame)))))) | 7128 | (window--maybe-raise-frame frame)))))) |
| 7131 | 7129 | ||