procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Speed up completion-in-mode-p in the common case

Browse source 
* lisp/simple.el (completion-in-mode-p): Make predicate more
efficient in the common one-mode case.
This commit is contained in:
Lars Ingebrigtsen 2021-02-15 04:22:29 +01:00
parent a81dc34bab
commit df99b17e4f
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lisp/simple.el
View file

@ -1978,15 +1978,20 @@ This function uses the `read-extended-command-predicate' user option."
"Say whether SYMBOL should be offered as a completion.
This is true if the command is applicable to the major mode in
BUFFER, or any of the active minor modes in BUFFER."
(or (null (command-modes symbol))
;; It's derived from a major mode.
(apply #'provided-mode-derived-p
(buffer-local-value 'major-mode buffer)
(command-modes symbol))
;; It's a minor mode.
(seq-intersection (command-modes symbol)
(buffer-local-value 'minor-modes buffer)
#'eq)))
(let ((modes (command-modes symbol)))
(or (null modes)
;; Common case: Just a single mode.
(if (null (cdr modes))
(or (provided-mode-derived-p
(buffer-local-value 'major-mode buffer) (car modes))
(memq (car modes) (buffer-local-value 'minor-modes buffer)))
;; Uncommon case: Multiple modes.
(apply #'provided-mode-derived-p
(buffer-local-value 'major-mode buffer)
modes)
(seq-intersection modes
(buffer-local-value 'minor-modes buffer)
#'eq)))))
(defun completion-with-modes-p (modes buffer)
"Say whether MODES are in action in BUFFER.