; Substitute quotes in obsoletion notice in 'C-h f'

* lisp/help-fns.el (help-fns--obsolete): Substitute quotes in string
arguments to 'obsolete' declarations.

* lisp/emacs-lisp/advice.el (defadvice): Markup symbols in 'obsolete'
declaration.  (Bug#66240)

diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index 3265809f592d2070580622e05f665dfae00d9c14..7fbdd963e0e431dae5dd33c620117ba0a3cf3ba5 100644 (file)
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -3131,7 +3131,7 @@ usage: (defadvice FUNCTION (CLASS NAME [POSITION] [ARGLIST] FLAG...)
           [DOCSTRING] [INTERACTIVE-FORM]
           BODY...)"
   (declare (doc-string 3) (indent 2)
-           (obsolete "use advice-add or define-advice" "30.1")
+           (obsolete "use `advice-add' or `define-advice'" "30.1")
            (debug (&define name  ;; thing being advised.
                            (name ;; class is [&or "before" "around" "after"
                                  ;;               "activation" "deactivation"]

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index b34778773a9e2cdd2d0c223edb6e47041c3f65f8..e93c535bbef2251d35f743a965604698e1acd822 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -767,7 +767,7 @@ the C sources, too."
              " is obsolete")
       (when (nth 2 obsolete)
         (insert (format " since %s" (nth 2 obsolete))))
-      (insert (cond ((stringp use) (concat "; " use))
+      (insert (cond ((stringp use) (concat "; " (substitute-quotes use)))
                     (use (format-message "; use `%s' instead." use))
                     (t "."))
               "\n")