* lisp/minibuffer.el (completion-in-region--single-word): Simplify

Remove redundant args `collection` and `predicate` which were always
equal to `minibuffer-completion-table` and
`minibuffer-completion-predicate` anyway.

(minibuffer-complete-word):
* lisp/emacs-lisp/crm.el (crm-complete-word): Simplify accordingly.
This commit is contained in:
Stefan Monnier 2021-06-26 12:29:52 -04:00
parent db3767e8db
commit b8f9e58ef7
2 changed files with 5 additions and 11 deletions

View file

@ -183,8 +183,7 @@ Return t if the current element is now a valid match; otherwise return nil."
Like `minibuffer-complete-word' but for `completing-read-multiple'."
(interactive)
(crm--completion-command beg end
(completion-in-region--single-word
beg end minibuffer-completion-table minibuffer-completion-predicate)))
(completion-in-region--single-word beg end)))
(defun crm-complete-and-exit ()
"If all of the minibuffer elements are valid completions then exit.

View file

@ -1790,17 +1790,12 @@ is added, provided that matches some possible completion.
Return nil if there is no valid completion, else t."
(interactive)
(completion-in-region--single-word
(minibuffer--completion-prompt-end) (point-max)
minibuffer-completion-table minibuffer-completion-predicate))
(minibuffer--completion-prompt-end) (point-max)))
(defun completion-in-region--single-word (beg end collection
&optional predicate)
(let ((minibuffer-completion-table collection)
(minibuffer-completion-predicate predicate))
(pcase (completion--do-completion beg end
#'completion--try-word-completion)
(defun completion-in-region--single-word (beg end)
(pcase (completion--do-completion beg end #'completion--try-word-completion)
(#b000 nil)
(_ t))))
(_ t)))
(defface completions-annotations '((t :inherit (italic shadow)))
"Face to use for annotations in the *Completions* buffer.")