(minibuffer-window-active-p): Use active-minibuffer-window.

diff --git a/lisp/window.el b/lisp/window.el
index d760b28830d712830f269c9cbd3991d2fb90e7bc..cd2e5c69425392869e38ee5618966322fd2cbb4a 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -74,17 +74,7 @@ Anything else means restrict to WINDOW's frame."
 
 (defun minibuffer-window-active-p (window)
   "Return t if WINDOW (a minibuffer window) is now active."
-  ;; nil nil means include WINDOW's frame
-  ;; and other frames using WINDOW as minibuffer,
-  ;; and include minibuffer if active.
-  (let ((prev (previous-window window nil nil)))
-    ;; If PREV equals WINDOW, WINDOW must be on a minibuffer-only frame
-    ;; and it's not currently being used.  So return nil.
-    (and (not (eq window prev))
-        (let ((should-be-same (next-window prev nil nil)))
-          ;; If next-window doesn't reverse previous-window,
-          ;; WINDOW must be outside the cycle specified by nil nil.
-          (eq should-be-same window)))))
+  (eq window (active-minibuffer-window)))
 \f
 (defun count-windows (&optional minibuf)
    "Returns the number of visible windows.