summaryrefslogtreecommitdiff
path: root/lisp/window.el
diff options
context:
space:
mode:
authorMartin Rudalics <rudalics@gmx.at>2017-10-28 11:37:26 +0200
committerMartin Rudalics <rudalics@gmx.at>2017-10-28 11:37:26 +0200
commit451823b0e5e71de8949bb0eadc9ea52ec795754f (patch)
tree70f61daa2b7aa8c9801053dff56f9417c7105b00 /lisp/window.el
parentcc8f72ca221e772bd925d9ba41bd4202eb7e5c04 (diff)
downloademacs-451823b0e5e71de8949bb0eadc9ea52ec795754f.tar.gz
Don't allow (minibuffer-window-active-p nil) to return t
* lisp/window.el (minibuffer-window-active-p): Return t only if WINDOW is a live window.
Diffstat (limited to 'lisp/window.el')
-rw-r--r--lisp/window.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/window.el b/lisp/window.el
index 5d9409bf62c..f87294ceb15 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -2583,7 +2583,7 @@ and no others."
(defun minibuffer-window-active-p (window)
"Return t if WINDOW is the currently active minibuffer window."
- (eq window (active-minibuffer-window)))
+ (and (window-live-p window) (eq window (active-minibuffer-window))))
(defun count-windows (&optional minibuf)
"Return the number of live windows on the selected frame.