From f303b64f0e1d949adaf2e6fce3d3c5a6728d898e Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Sat, 5 Sep 2020 17:23:31 +0200 Subject: [PATCH] Revert "info-lookup-symbol: Fix the suggested default value in Custom buffers" This reverts commit ccae4ea6990580e7489e7c9f958b4a094b32b8b8. We can't use a string with a display string here, anyway, because it's used in other contexts. --- lisp/info-look.el | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lisp/info-look.el b/lisp/info-look.el index 97d4f11af81..4e379cadef1 100644 --- a/lisp/info-look.el +++ b/lisp/info-look.el @@ -298,8 +298,7 @@ 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 - (substring-no-properties default)) + (format "Describe %s (default %s): " topic default) (format "Describe %s: " topic)) completions nil nil nil 'info-lookup-history default))) (list (if (equal value "") default value) mode))) @@ -649,9 +648,6 @@ 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." @@ -1069,6 +1065,7 @@ 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 -- 2.39.5