summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Aranda <maurooaranda@gmail.com>2020-09-05 17:07:30 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2020-09-05 17:07:41 +0200
commitccae4ea6990580e7489e7c9f958b4a094b32b8b8 (patch)
tree9f1eef9a334cd0162d0c6d998727208258413ca6
parent60e3353697efb00afd084d45dba41adcafc388f9 (diff)
downloademacs-ccae4ea6990580e7489e7c9f958b4a094b32b8b8.tar.gz
info-lookup-symbol: Fix the suggested default value in Custom buffers
* lisp/info-look.el (info-lookup-maybe-add-help 'Custom-mode): Don't pass info-lookup-guess-custom-symbol as the :parse-rule, since we don't need it anymore. (Bug#41905) (info-lookup-guess-custom-symbol): Now unused, mark as obsolete. (info-lookup-interactive-arguments): Get rid of text properties before passing the default value to completing-read.
-rw-r--r--lisp/info-look.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/info-look.el b/lisp/info-look.el
index 4e379cadef1..97d4f11af81 100644
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -298,7 +298,8 @@ If optional argument QUERY is non-nil, query for the help mode."
(enable-recursive-minibuffers t)
(value (completing-read
(if default
- (format "Describe %s (default %s): " topic default)
+ (format "Describe %s (default %s): " topic
+ (substring-no-properties default))
(format "Describe %s: " topic))
completions nil nil nil 'info-lookup-history default)))
(list (if (equal value "") default value) mode)))
@@ -648,6 +649,9 @@ Return nil if there is nothing appropriate in the buffer near point."
(> end beg)))
(buffer-substring-no-properties beg end)))))
(error nil)))
+;; We don't need this anymore, because now Custom inserts the unlispified name
+;; in the buffer. (Bug#41905)
+(make-obsolete 'info-lookup-guess-custom-symbol nil "28.1")
(defun info-lookup-guess-gdb-script-symbol ()
"Get symbol at point in GDB script buffers."
@@ -1065,7 +1069,6 @@ Return nil if there is nothing appropriate in the buffer near point."
:mode 'Custom-mode
:ignore-case t
:regexp "[^][()`'‘’,:\" \t\n]+"
- :parse-rule 'info-lookup-guess-custom-symbol
:other-modes '(emacs-lisp-mode))
(info-lookup-maybe-add-help