diff options
| author | Lars Ingebrigtsen | 2020-09-05 17:23:31 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2020-09-05 17:23:31 +0200 |
| commit | f303b64f0e1d949adaf2e6fce3d3c5a6728d898e (patch) | |
| tree | b33a144bccc7ff7e979e3574de65c3b850911c9b | |
| parent | ccae4ea6990580e7489e7c9f958b4a094b32b8b8 (diff) | |
| download | emacs-f303b64f0e1d949adaf2e6fce3d3c5a6728d898e.tar.gz emacs-f303b64f0e1d949adaf2e6fce3d3c5a6728d898e.zip | |
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.
| -rw-r--r-- | lisp/info-look.el | 7 |
1 files 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." | |||
| 298 | (enable-recursive-minibuffers t) | 298 | (enable-recursive-minibuffers t) |
| 299 | (value (completing-read | 299 | (value (completing-read |
| 300 | (if default | 300 | (if default |
| 301 | (format "Describe %s (default %s): " topic | 301 | (format "Describe %s (default %s): " topic default) |
| 302 | (substring-no-properties default)) | ||
| 303 | (format "Describe %s: " topic)) | 302 | (format "Describe %s: " topic)) |
| 304 | completions nil nil nil 'info-lookup-history default))) | 303 | completions nil nil nil 'info-lookup-history default))) |
| 305 | (list (if (equal value "") default value) mode))) | 304 | (list (if (equal value "") default value) mode))) |
| @@ -649,9 +648,6 @@ Return nil if there is nothing appropriate in the buffer near point." | |||
| 649 | (> end beg))) | 648 | (> end beg))) |
| 650 | (buffer-substring-no-properties beg end))))) | 649 | (buffer-substring-no-properties beg end))))) |
| 651 | (error nil))) | 650 | (error nil))) |
| 652 | ;; We don't need this anymore, because now Custom inserts the unlispified name | ||
| 653 | ;; in the buffer. (Bug#41905) | ||
| 654 | (make-obsolete 'info-lookup-guess-custom-symbol nil "28.1") | ||
| 655 | 651 | ||
| 656 | (defun info-lookup-guess-gdb-script-symbol () | 652 | (defun info-lookup-guess-gdb-script-symbol () |
| 657 | "Get symbol at point in GDB script buffers." | 653 | "Get symbol at point in GDB script buffers." |
| @@ -1069,6 +1065,7 @@ Return nil if there is nothing appropriate in the buffer near point." | |||
| 1069 | :mode 'Custom-mode | 1065 | :mode 'Custom-mode |
| 1070 | :ignore-case t | 1066 | :ignore-case t |
| 1071 | :regexp "[^][()`'‘’,:\" \t\n]+" | 1067 | :regexp "[^][()`'‘’,:\" \t\n]+" |
| 1068 | :parse-rule 'info-lookup-guess-custom-symbol | ||
| 1072 | :other-modes '(emacs-lisp-mode)) | 1069 | :other-modes '(emacs-lisp-mode)) |
| 1073 | 1070 | ||
| 1074 | (info-lookup-maybe-add-help | 1071 | (info-lookup-maybe-add-help |