diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-08-25 18:46:18 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-08-25 19:00:21 -0700 |
| commit | bcfe2e0ed5018bf796cbb41465377fa1e38863b8 (patch) | |
| tree | 442098b9e75518448f4c20d28ccdbf2fdd97bf01 /lisp | |
| parent | 71781c31a4860e56434643296eaa303ca43386bb (diff) | |
| download | emacs-bcfe2e0ed5018bf796cbb41465377fa1e38863b8.tar.gz | |
Fix customization of text-quoting-style
* 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.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/cus-edit.el | 6 | ||||
| -rw-r--r-- | lisp/cus-start.el | 8 | ||||
| -rw-r--r-- | lisp/wid-edit.el | 2 |
3 files changed, 7 insertions, 9 deletions
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))) diff --git a/lisp/cus-start.el b/lisp/cus-start.el index daa95d1cb9d..2b9cc094f95 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -224,11 +224,9 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (text-quoting-style help (choice - (const :tag "Quote with curved single quotes" curve) - (const :tag "Quote with straight apostrophes 'like this'" - straight) - (const :tag "Quote with grave accent and apostrophe `like this'" - grave) + (const :tag "Quote with curved single quotes \\=‘like this\\=’" curve) + (const :tag "Quote with straight apostrophes \\='like this\\='" straight) + (const :tag "Quote with grave accent and apostrophe \\=`like this\\='" grave) (const :tag "Use curved quotes if displayable, grave accent and apostrophe otherwise" nil)) "25.1") ;; dosfns.c diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el index e98ac18fc5e..0c8f4af58e1 100644 --- a/lisp/wid-edit.el +++ b/lisp/wid-edit.el @@ -1676,7 +1676,7 @@ as the argument to `documentation-property'." (cond ((functionp doc-prop) (funcall doc-prop value)) ((symbolp doc-prop) - (documentation-property value doc-prop))))))) + (documentation-property value doc-prop t))))))) (when (and (stringp doc) (> (length doc) 0)) ;; Remove any redundant `*' in the beginning. (when (eq (aref doc 0) ?*) |