summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/gnus/mm-decode.el2
-rw-r--r--lisp/help-fns.el18
-rw-r--r--lisp/textmodes/picture.el1
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]