aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorPaul Eggert2015-08-31 00:04:11 -0700
committerPaul Eggert2015-08-31 00:05:31 -0700
commit41ed99a322f35639bdc7402b1b7089d85782e8d3 (patch)
tree07e4ace0915225f367c7d38e33acdaee26b99e5f /lisp
parent8d76c00728eb8ba41d04bc9344181aeffe158501 (diff)
downloademacs-41ed99a322f35639bdc7402b1b7089d85782e8d3.tar.gz
emacs-41ed99a322f35639bdc7402b1b7089d85782e8d3.zip
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.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/emacs-lisp/bytecomp.el4
-rw-r--r--lisp/emacs-lisp/macroexp.el2
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."
2989 (byte-compile-warn "‘%s’ is for interactive use only%s" 2989 (byte-compile-warn "‘%s’ is for interactive use only%s"
2990 fn 2990 fn
2991 (cond ((stringp interactive-only) 2991 (cond ((stringp interactive-only)
2992 (format "; %s" interactive-only)) 2992 (format "; %s"
2993 (substitute-command-keys
2994 interactive-only)))
2993 ((and (symbolp 'interactive-only) 2995 ((and (symbolp 'interactive-only)
2994 (not (eq interactive-only t))) 2996 (not (eq interactive-only t)))
2995 (format-message "; use ‘%s’ instead." 2997 (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."
149 (format-message 149 (format-message
150 "‘%s’ is an obsolete %s%s%s" fun type 150 "‘%s’ is an obsolete %s%s%s" fun type
151 (if asof (concat " (as of " asof ")") "") 151 (if asof (concat " (as of " asof ")") "")
152 (cond ((stringp instead) (concat "; " instead)) 152 (cond ((stringp instead) (concat "; " (substitute-command-keys instead)))
153 (instead (format-message "; use ‘%s’ instead." instead)) 153 (instead (format-message "; use ‘%s’ instead." instead))
154 (t "."))))) 154 (t ".")))))
155 155