From 41ed99a322f35639bdc7402b1b7089d85782e8d3 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 31 Aug 2015 00:04:11 -0700 Subject: [PATCH] =?utf8?q?Treat=20=E2=80=9Cinstead=E2=80=9D=20strings=20as?= =?utf8?q?=20docstrings?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * lisp/emacs-lisp/bytecomp.el (byte-compile-form): * lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning): Substitute quotes in instead strings. --- lisp/emacs-lisp/bytecomp.el | 4 +++- lisp/emacs-lisp/macroexp.el | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) 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 "."))))) -- 2.39.2