diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-03-12 00:10:59 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-03-12 00:10:59 -0400 |
| commit | dbbc2e69e4fb3b8278a33fb3f5256786b18e8180 (patch) | |
| tree | 48db6fd47343d44c2d689c9655072218e8f32b70 /lisp/minibuffer.el | |
| parent | 5d1ac394e135c411ff7e793e0a05ab5e2f7d2066 (diff) | |
| download | emacs-dbbc2e69e4fb3b8278a33fb3f5256786b18e8180.tar.gz emacs-dbbc2e69e4fb3b8278a33fb3f5256786b18e8180.tar.bz2 emacs-dbbc2e69e4fb3b8278a33fb3f5256786b18e8180.zip | |
* lisp/minibuffer.el (minibuffer-complete): Don't get confused when the
function is run twice via different commands.
(complete-with-action): Fix docstring.
Fixes: debbugs:10958
Diffstat (limited to 'lisp/minibuffer.el')
| -rw-r--r-- | lisp/minibuffer.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 1a1a37258c4..6a6bba13523 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -162,7 +162,7 @@ Like CL's `some'." (defun complete-with-action (action table string pred) "Perform completion ACTION. STRING is the string to complete. -TABLE is the completion table, which should not be a function. +TABLE is the completion table. PRED is a completion predicate. ACTION can be one of nil, t or `lambda'." (cond @@ -776,7 +776,8 @@ scroll the window of possible completions." (interactive) ;; If the previous command was not this, ;; mark the completion buffer obsolete. - (unless (eq this-command last-command) + (setq this-command 'completion-at-point) + (unless (eq 'completion-at-point last-command) (completion--flush-all-sorted-completions) (setq minibuffer-scroll-window nil)) |