From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 31 Aug 2015 07:04:11 +0000 (-0700)
Subject: Treat “instead” strings as docstrings
X-Git-Tag: emacs-25.0.90~1230^2~19
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=41ed99a322f35639bdc7402b1b7089d85782e8d3;p=emacs.git

Treat “instead” strings as docstrings

* lisp/emacs-lisp/bytecomp.el (byte-compile-form):
* lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning):
Substitute quotes in instead strings.
---

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 8b8b667f596..7182c0b6372 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -2989,7 +2989,9 @@ for symbols generated by the byte compiler itself."
 	  (byte-compile-warn "‘%s’ is for interactive use only%s"
 			     fn
 			     (cond ((stringp interactive-only)
-				    (format "; %s" interactive-only))
+				    (format "; %s"
+					    (substitute-command-keys
+					     interactive-only)))
 				   ((and (symbolp 'interactive-only)
 					 (not (eq interactive-only t)))
 				    (format-message "; use ‘%s’ instead."
diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el
index ff359e6096e..6189976e866 100644
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -149,7 +149,7 @@ and also to avoid outputting the warning during normal execution."
     (format-message
      "‘%s’ is an obsolete %s%s%s" fun type
      (if asof (concat " (as of " asof ")") "")
-     (cond ((stringp instead) (concat "; " instead))
+     (cond ((stringp instead) (concat "; " (substitute-command-keys instead)))
            (instead (format-message "; use ‘%s’ instead." instead))
            (t ".")))))