diff options
| author | Ryan C. Thompson <rct@thompsonclan.org> | 2017-07-26 11:09:42 -0700 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2017-11-07 21:25:55 -0500 |
| commit | 255ba01148f69f452937e67feb7af5d4c1466fed (patch) | |
| tree | c89e0c1430d085a30222dcc758165c4ce6e66225 /lisp/minibuffer.el | |
| parent | 949b70a7d80c79b2593a7d88f6543e29dc63ed18 (diff) | |
| download | emacs-255ba01148f69f452937e67feb7af5d4c1466fed.tar.gz emacs-255ba01148f69f452937e67feb7af5d4c1466fed.tar.bz2 emacs-255ba01148f69f452937e67feb7af5d4c1466fed.zip | |
Fix handling of nil PRED2 arg for completion-table-with-predicate
* lisp/minibuffer.el (completion-table-with-predicate): Don't act as
if strict is non-nil when pred2 is nil (Bug#27841).
* test/lisp/minibuffer-tests.el
(completion-table-with-predicate-test): Add a test for Bug#27841.
Diffstat (limited to 'lisp/minibuffer.el')
| -rw-r--r-- | lisp/minibuffer.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index f13f1fa7984..26861de87b0 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -392,7 +392,7 @@ obeys predicates." (and (funcall pred1 x) (funcall pred2 x))))) ;; If completion failed and we're not applying pred1 strictly, try ;; again without pred1. - (and (not strict) pred1 pred2 + (and (not strict) pred1 (complete-with-action action table string pred2)))))) (defun completion-table-in-turn (&rest tables) |