diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-05-22 10:18:51 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-05-22 10:18:51 -0700 |
| commit | 5c21832ae866077874fb662e49c695a7850ec22c (patch) | |
| tree | 2955309c3cbe881985426e6e1e41cb0d3d7a21ad /lisp | |
| parent | d99f0c6fb831da5cc5e4ca2661d660906f30625d (diff) | |
| parent | b0da9151d880f7ae60367a4b3d3ef91209bbd06f (diff) | |
| download | emacs-5c21832ae866077874fb662e49c695a7850ec22c.tar.gz | |
Merge from origin/emacs-26
b0da915 (origin/emacs-26, emacs-26) Fix a typo in ELisp manual
400907b Add option to disable help completion autoloading (Bug#28607)
122ba16 Don't segfault on force-window-update of deleted window
015b12e Fix typo in ELisp manual
eadf044 Remove repeated function call in picture.el
1228a90 ; Fix mm-destroy-parts docstring typo
6cfd68d Fix Hideshow key binding typo in Emacs manual
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/gnus/mm-decode.el | 2 | ||||
| -rw-r--r-- | lisp/help-fns.el | 18 | ||||
| -rw-r--r-- | lisp/textmodes/picture.el | 1 |
3 files changed, 16 insertions, 5 deletions
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index 5b1859e3240..0b9cdde1fa5 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -1111,7 +1111,7 @@ external if displayed external." (mm-remove-part handle))))))) (defun mm-destroy-parts (handles) - "Remove the displayed MIME parts represented by HANDLES." + "Destroy the displayed MIME parts represented by HANDLES." (if (and (listp handles) (bufferp (car handles))) (mm-destroy-part handles) diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 9d997368074..91b4104becf 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -103,11 +103,23 @@ and the output should go to `standard-output'.") (with-demoted-errors "while loading: %S" (load file 'noerror 'nomessage)))))) +(defcustom help-enable-completion-auto-load t + "Whether completion for Help commands can perform autoloading. +If non-nil, whenever invoking completion for `describe-function' +or `describe-variable' load files that might contain definitions +with the current prefix. The files are chosen according to +`definition-prefixes'." + :type 'boolean + :group 'help + :version "26.3") + (defun help--symbol-completion-table (string pred action) - (let ((prefixes (radix-tree-prefixes (help-definition-prefixes) string))) - (help--load-prefixes prefixes)) + (when help-enable-completion-auto-load + (let ((prefixes (radix-tree-prefixes (help-definition-prefixes) string))) + (help--load-prefixes prefixes))) (let ((prefix-completions - (mapcar #'intern (all-completions string definition-prefixes)))) + (and help-enable-completion-auto-load + (mapcar #'intern (all-completions string definition-prefixes))))) (complete-with-action action obarray string (if pred (lambda (sym) (or (funcall pred sym) diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el index 0b508547314..79039bc1980 100644 --- a/lisp/textmodes/picture.el +++ b/lisp/textmodes/picture.el @@ -624,7 +624,6 @@ Leaves the region surrounding the rectangle." (defvar picture-mode-map (let ((map (make-keymap))) (define-key map [remap self-insert-command] 'picture-self-insert) - (define-key map [remap self-insert-command] 'picture-self-insert) (define-key map [remap completion-separator-self-insert-command] 'picture-self-insert) (define-key map [remap completion-separator-self-insert-autofilling] |