summaryrefslogtreecommitdiff
path: root/lisp/simple.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1995-03-31 01:48:40 +0000
committerRichard M. Stallman <rms@gnu.org>1995-03-31 01:48:40 +0000
commit7f7451af97504299d849ff553b7654fea8a96110 (patch)
tree677084a99188eb2ef19959987b995ad6577eeee8 /lisp/simple.el
parent72946abda54ad5ce81a5dc47f4ff7eee689337c6 (diff)
downloademacs-7f7451af97504299d849ff553b7654fea8a96110.tar.gz
(choose-completion-string): Use active-minibuffer-window.
Diffstat (limited to 'lisp/simple.el')
-rw-r--r--lisp/simple.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/simple.el b/lisp/simple.el
index 90ee2642c9d..0a4bb2a4248 100644
--- 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)