aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2017-10-28 11:37:26 +0200
committerMartin Rudalics2017-10-28 11:37:26 +0200
commit451823b0e5e71de8949bb0eadc9ea52ec795754f (patch)
tree70f61daa2b7aa8c9801053dff56f9417c7105b00
parentcc8f72ca221e772bd925d9ba41bd4202eb7e5c04 (diff)
downloademacs-451823b0e5e71de8949bb0eadc9ea52ec795754f.tar.gz
emacs-451823b0e5e71de8949bb0eadc9ea52ec795754f.zip
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.
-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."
2583 2583
2584(defun minibuffer-window-active-p (window) 2584(defun minibuffer-window-active-p (window)
2585 "Return t if WINDOW is the currently active minibuffer window." 2585 "Return t if WINDOW is the currently active minibuffer window."
2586 (eq window (active-minibuffer-window))) 2586 (and (window-live-p window) (eq window (active-minibuffer-window))))
2587 2587
2588(defun count-windows (&optional minibuf) 2588(defun count-windows (&optional minibuf)
2589 "Return the number of live windows on the selected frame. 2589 "Return the number of live windows on the selected frame.