(choose-completion-string): Use active-minibuffer-window.

diff --git a/lisp/simple.el b/lisp/simple.el
index 90ee2642c9d22b4684a567a4a8011d1842ab40fc..0a4bb2a42480008b155adfb4d307acd32500da53 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2729,8 +2729,9 @@ WIth prefix argument N, move N items (negative N means move backward)."
     ;; If BUFFER is a minibuffer, barf unless it's the currently
     ;; active minibuffer.
     (if (and (string-match "\\` \\*Minibuf-[0-9]+\\*\\'" (buffer-name buffer))
-            (or (not (minibuffer-window-active-p (minibuffer-window)))
-                (not (equal buffer (window-buffer (minibuffer-window))))))
+            (or (not (active-minibuffer-window))
+                (not (equal buffer
+                            (window-buffer (active-minibuffer-window))))))
        (error "Minibuffer is not active for completion")
       ;; Insert the completion into the buffer where completion was requested.
       (set-buffer buffer)