diff options
| author | Richard M. Stallman | 1995-03-31 01:48:40 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1995-03-31 01:48:40 +0000 |
| commit | 45486731af0f5ee95a877c9020fd5b66a152dd81 (patch) | |
| tree | aa6380fd9166f644a7f42da2f2cc3b071bfe866b | |
| parent | cb79b372cf6187a7f15a47fac7e77a76aee4ceda (diff) | |
| download | emacs-45486731af0f5ee95a877c9020fd5b66a152dd81.tar.gz emacs-45486731af0f5ee95a877c9020fd5b66a152dd81.zip | |
(choose-completion-string): Use active-minibuffer-window.
| -rw-r--r-- | lisp/simple.el | 5 |
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)." | |||
| 2729 | ;; If BUFFER is a minibuffer, barf unless it's the currently | 2729 | ;; If BUFFER is a minibuffer, barf unless it's the currently |
| 2730 | ;; active minibuffer. | 2730 | ;; active minibuffer. |
| 2731 | (if (and (string-match "\\` \\*Minibuf-[0-9]+\\*\\'" (buffer-name buffer)) | 2731 | (if (and (string-match "\\` \\*Minibuf-[0-9]+\\*\\'" (buffer-name buffer)) |
| 2732 | (or (not (minibuffer-window-active-p (minibuffer-window))) | 2732 | (or (not (active-minibuffer-window)) |
| 2733 | (not (equal buffer (window-buffer (minibuffer-window)))))) | 2733 | (not (equal buffer |
| 2734 | (window-buffer (active-minibuffer-window)))))) | ||
| 2734 | (error "Minibuffer is not active for completion") | 2735 | (error "Minibuffer is not active for completion") |
| 2735 | ;; Insert the completion into the buffer where completion was requested. | 2736 | ;; Insert the completion into the buffer where completion was requested. |
| 2736 | (set-buffer buffer) | 2737 | (set-buffer buffer) |