From bcfe2e0ed5018bf796cbb41465377fa1e38863b8 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 25 Aug 2015 18:46:18 -0700 Subject: Fix customization of text-quoting-style MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * lisp/cus-edit.el (custom-guess-type, custom-variable-documentation): * lisp/wid-edit.el (widget-docstring): Get raw docstring here since it’s cooked later and should not be cooked twice. * lisp/cus-edit.el (custom-group-value-create): Cook the docstring before inserting it. * lisp/cus-start.el (text-quoting-style): Quote the customization docstrings according to the new rules. Give curved examples. --- lisp/cus-edit.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lisp/cus-edit.el') diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 8fea5d85f4d..2b5ada19974 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -633,7 +633,7 @@ if that fails, the doc string with `custom-guess-doc-alist'." (setq found (nth 1 current) names nil))) (unless found - (let ((doc (documentation-property symbol 'variable-documentation)) + (let ((doc (documentation-property symbol 'variable-documentation t)) (docs custom-guess-doc-alist)) (when doc (while docs @@ -2457,7 +2457,7 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"." "Return documentation of VARIABLE for use in Custom buffer. Normally just return the docstring. But if VARIABLE automatically becomes buffer local when set, append a message to that effect." - (format "%s%s" (documentation-property variable 'variable-documentation) + (format "%s%s" (documentation-property variable 'variable-documentation t) (if (and (local-variable-if-set-p variable) (or (not (local-variable-p variable)) (with-temp-buffer @@ -3995,7 +3995,7 @@ If GROUPS-ONLY is non-nil, return only those members that are groups." (members (custom-group-members symbol (and (eq custom-buffer-style 'tree) custom-browse-only-groups))) - (doc (widget-docstring widget))) + (doc (substitute-command-keys (widget-docstring widget)))) (cond ((and (eq custom-buffer-style 'tree) (eq state 'hidden) (or members (custom-unloaded-widget-p widget))) -- cgit v1.2.1