Commit 45486731 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

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

parent cb79b372
...@@ -2729,8 +2729,9 @@ WIth prefix argument N, move N items (negative N means move backward)." ...@@ -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 ;; If BUFFER is a minibuffer, barf unless it's the currently
;; active minibuffer. ;; active minibuffer.
(if (and (string-match "\\` \\*Minibuf-[0-9]+\\*\\'" (buffer-name buffer)) (if (and (string-match "\\` \\*Minibuf-[0-9]+\\*\\'" (buffer-name buffer))
(or (not (minibuffer-window-active-p (minibuffer-window))) (or (not (active-minibuffer-window))
(not (equal buffer (window-buffer (minibuffer-window)))))) (not (equal buffer
(window-buffer (active-minibuffer-window))))))
(error "Minibuffer is not active for completion") (error "Minibuffer is not active for completion")
;; Insert the completion into the buffer where completion was requested. ;; Insert the completion into the buffer where completion was requested.
(set-buffer buffer) (set-buffer buffer)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment