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

Re-enable caching for 'M-x man' completion on macOS

Browse source 
On macOS, getting the completion results when you type 'M-x man RET' can
take up to several seconds, even on a reasonably modern MacBook Pro,
probably due to the lack of man-db and the need to process the output.

Caching of "man -k ^" completion results was added in 2009 due to
perceived slowness on some systems, but was unfortunately effectively
disabled again in 2013.  Let's re-enable it on macOS.

* lisp/man.el (Man-cache-completion-results-flag): New variable
set to t by default on macOS, and nil elsewhere.
(man): Cache completion results when above new variable is t.
This commit is contained in:
Stefan Kangas 2025-01-03 03:12:37 +01:00
parent 58c95e9bab
commit 004a48b3d4
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lisp/man.el
View file

@ -135,6 +135,11 @@ the manpage buffer."
"Non-nil means make up the manpage with fonts."
:type 'boolean)
(defvar Man-cache-completion-results-flag (eq system-type 'darwin)
"Non-nil means cache completion results for `man'.
This is non-nil by default on macOS, because getting and filtering
\"man -k ^\" results is slower there than on GNU/Linux.")
(defvar Man-ansi-color-basic-faces-vector
[nil Man-overstrike nil Man-underline Man-underline nil nil Man-reverse]
"The value used here for `ansi-color-basic-faces-vector'.")
@ -1120,13 +1125,17 @@ for the current invocation."
;; ("man -k" is case-insensitive similarly, so the
;; table has everything available to complete)
(completion-ignore-case t)
Man-completion-cache ;Don't cache across calls.
(input (completing-read
(format-prompt "Manual entry"
(and (not (equal default-entry ""))
default-entry))
'Man-completion-table
nil nil nil 'Man-topic-history default-entry)))
(input
(cl-flet ((read ()
(completing-read
(format-prompt "Manual entry"
(and (not (equal default-entry ""))
default-entry))
#'Man-completion-table
nil nil nil 'Man-topic-history default-entry)))
(if Man-cache-completion-results-flag
(read)
(let ((Man-completion-cache)) (read))))))
(if (string= input "")
(error "No man args given")
input))))