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/warnings.el | |
| 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/warnings.el')
| -rw-r--r-- | lisp/emacs-lisp/warnings.el | 4 |
1 files changed, 2 insertions, 2 deletions
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." |