bug#41905: Small change: In Customize, display name with with spaces, but keep symbol name underneath.

[Mauro Aranda <maurooaranda@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 469 bytes --]

Lars Ingebrigtsen <larsi@gnus.org> writes:

> Mauro Aranda <maurooaranda@gmail.com> writes:
>
>> Sure, here is the patch I'm running with
>
> Thanks, that makes C-h S use the correct string.  However, the prompt is
> confusing:

[...]

> Because it's using the string from the buffer...  including the 'display
> text property.  Perhaps it should strip all text properties before being
> used?

Then I guess we must change info-lookup-interactive-arguments to do that.

[-- Attachment #1.2: Type: text/html, Size: 673 bytes --]

[-- Attachment #2: 0001-info-lookup-symbol-Fix-the-suggested-default-value-i.patch --]
[-- Type: text/x-patch, Size: 1961 bytes --]

From 1937e2d0119c692683c01eded8585ccafba5349c Mon Sep 17 00:00:00 2001
From: Mauro Aranda <maurooaranda@gmail.com>
Date: Sat, 5 Sep 2020 11:06:36 -0300
Subject: [PATCH] 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 4e379cadef..76c39bcd86 100644
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -298,7 +298,8 @@ info-lookup-interactive-arguments
 	 (enable-recursive-minibuffers t)
 	 (value (completing-read
 		 (if default
-		     (format "Describe %s (default %s): " topic default)
+                     (progn (set-text-properties 0 (length default) nil 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)))
@@ -648,6 +649,9 @@ info-lookup-guess-custom-symbol
 		     (> 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 @@ info-complete
  :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.28.0