emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master ccae4ea 1/3: info-lookup-symbol: Fix the suggested default value


From: Lars Ingebrigtsen
Subject: master ccae4ea 1/3: info-lookup-symbol: Fix the suggested default value in Custom buffers
Date: Sat, 5 Sep 2020 11:26:14 -0400 (EDT)

branch: master
commit ccae4ea6990580e7489e7c9f958b4a094b32b8b8
Author: Mauro Aranda <maurooaranda@gmail.com>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    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.
---
 lisp/info-look.el | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lisp/info-look.el b/lisp/info-look.el
index 4e379ca..97d4f11 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]