diff options
| author | K. Handa <handa@gnu.org> | 2015-09-01 20:46:15 +0900 |
|---|---|---|
| committer | K. Handa <handa@gnu.org> | 2015-09-01 20:46:15 +0900 |
| commit | 3e0e2339cd379eeba8d9bc758f2e8e574144e252 (patch) | |
| tree | 9d119efed6e52e5c24dbd84836148157271799a8 /lisp/emacs-lisp | |
| parent | 524eeb2e5e158d98ea52fe5ebe4768c4433ba8b2 (diff) | |
| parent | ff0a92f6461941902eb9e974bdd2ff9adacb7bc4 (diff) | |
| download | emacs-3e0e2339cd379eeba8d9bc758f2e8e574144e252.tar.gz emacs-3e0e2339cd379eeba8d9bc758f2e8e574144e252.tar.bz2 emacs-3e0e2339cd379eeba8d9bc758f2e8e574144e252.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 4 | ||||
| -rw-r--r-- | lisp/emacs-lisp/checkdoc.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/macroexp.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/warnings.el | 4 |
4 files changed, 7 insertions, 5 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/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index 8a845f9b5b5..b2c81197968 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el @@ -1954,7 +1954,7 @@ from the comment." "Return non-nil if the current point is in a code fragment. A code fragment is identified by an open parenthesis followed by a symbol which is a valid function or a word in all CAPS, or a parenthesis -that is quoted with the ' character. Only the region from START to LIMIT +that is quoted with the \\=' character. Only the region from START to LIMIT is allowed while searching for the bounding parenthesis." (save-match-data (save-restriction 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 "."))))) diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el index d729a9a9563..b88af1dbe1a 100644 --- a/lisp/emacs-lisp/warnings.el +++ b/lisp/emacs-lisp/warnings.el @@ -314,7 +314,7 @@ See also `warning-series', `warning-prefix-function' and ;; Any keymap that is defined will do. ;;;###autoload (defun lwarn (type level message &rest args) - "Display a warning message made from (format MESSAGE ARGS...). + "Display a warning message made from (format-message MESSAGE ARGS...). \\<special-mode-map> Aside from generating the message with `format-message', this is equivalent to `display-warning'. @@ -336,7 +336,7 @@ LEVEL should be either :debug, :warning, :error, or :emergency ;;;###autoload (defun warn (message &rest args) - "Display a warning message made from (format MESSAGE ARGS...). + "Display a warning message made from (format-message MESSAGE ARGS...). Aside from generating the message with `format-message', this is equivalent to `display-warning', using `emacs' as the type and `:warning' as the level." |