diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-12-30 16:57:36 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-12-30 16:57:36 -0800 |
| commit | a8e545ef6b92f6eb5916a6803a5d95256fd9eb6b (patch) | |
| tree | 38752101a9dcceb10009f017bced8e0a213e21ed /lisp/window.el | |
| parent | 83bbb48142e5f9714408dd628d244678eff2dc11 (diff) | |
| parent | 3abebeb8c3047092763f2d4a61fe7dfc659cd1bf (diff) | |
| download | emacs-a8e545ef6b92f6eb5916a6803a5d95256fd9eb6b.tar.gz emacs-a8e545ef6b92f6eb5916a6803a5d95256fd9eb6b.tar.bz2 emacs-a8e545ef6b92f6eb5916a6803a5d95256fd9eb6b.zip | |
Merge from origin/emacs-26
3abebeb * lisp/files.el (cd): Fix last change. (Bug#33791)
7a60a4f Fix remote directories in Eshell on MS-Windows
822a2d0 Fix :type 'group' in defcustom
a731c56 Fix NS fringe bitmap drawing bug (bug#33864)
0c52459 Fix commentary in dispnew.c
c9fdd1b Improve accept-process-process doc
9578c2a Fix a simple bug in display-buffer-use-some-frame
0f9be72 Clarify thread switching while waiting for process output
24ddea0 Improve process doc. with respect to handling of large input ...
2931016 ; Cosmetic changes in etc/NEWS
85516b8 Minor copyedits in landmark.el
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/window.el')
| -rw-r--r-- | lisp/window.el | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lisp/window.el b/lisp/window.el index 4e72d343674..f1e56643671 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -7182,9 +7182,7 @@ that allows the selected frame)." (or (cdr (assq 'frame-predicate alist)) (lambda (frame) (and (not (eq frame (selected-frame))) - (not (window-dedicated-p - (or (get-lru-window frame) - (frame-first-window frame)))))))) + (get-lru-window frame))))) (frame (car (filtered-frame-list predicate))) (window (and frame |