aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2002-07-26 07:09:15 +0000
committerJuanma Barranquero2002-07-26 07:09:15 +0000
commite7a4fab7308c26c48888e317bbf89cd4ab941737 (patch)
tree83c4b5bf285c101cee1cf7dcb471ee3cb12fd81d
parente5184e9fcb07c63398ce4d6163fdd8e5597a88dd (diff)
downloademacs-e7a4fab7308c26c48888e317bbf89cd4ab941737.tar.gz
emacs-e7a4fab7308c26c48888e317bbf89cd4ab941737.zip
(lwarn, warn): Doc fix.
-rw-r--r--lisp/ChangeLog12
-rw-r--r--lisp/warnings.el4
2 files changed, 10 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4e0e53a0a7e..d5477951ee3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12002-07-26 Juanma Barranquero <lektu@terra.es>
2
3 * warnings.el (lwarn, warn): Doc fix.
4
12002-07-25 Markus Rost <rost@math.ohio-state.edu> 52002-07-25 Markus Rost <rost@math.ohio-state.edu>
2 6
3 * ediff-wind.el (ediff-window-setup-function): Extend type 7 * ediff-wind.el (ediff-window-setup-function): Extend type
@@ -44,13 +48,13 @@
44 (reftex-extract-bib-entries): Use `reftex-get-bibkey-default' to 48 (reftex-extract-bib-entries): Use `reftex-get-bibkey-default' to
45 get a default regex. 49 get a default regex.
46 50
47 * textmodes/reftex-toc.el (reftex-toc-mode): make-local-hook for 51 * textmodes/reftex-toc.el (reftex-toc-mode): Use `make-local-hook' for
48 XEmacs compatibility (got OK from RMS). 52 XEmacs compatibility (got OK from RMS).
49 53
50 * textmodes/reftex-index.el (reftex-index-mode): likewise. 54 * textmodes/reftex-index.el (reftex-index-mode): Likewise.
51 55
52 * textmodes/reftex-sel.el (reftex-select-label-mode): likewise. 56 * textmodes/reftex-sel.el (reftex-select-label-mode): Likewise.
53 (reftex-select-bib-mode): likewise 57 (reftex-select-bib-mode): Likewise
54 58
552002-07-25 Colin Walters <walters@debian.org> 592002-07-25 Colin Walters <walters@debian.org>
56 60
diff --git a/lisp/warnings.el b/lisp/warnings.el
index 054dc4d65ac..9f202fd24a3 100644
--- a/lisp/warnings.el
+++ b/lisp/warnings.el
@@ -249,7 +249,7 @@ See also `warning-series', `warning-prefix-function' and
249(defun lwarn (group level message &rest args) 249(defun lwarn (group level message &rest args)
250 "Display a warning message made from (format MESSAGE ARGS...). 250 "Display a warning message made from (format MESSAGE ARGS...).
251Aside from generating the message with `format', 251Aside from generating the message with `format',
252this is equivalent to `display-message'. 252this is equivalent to `display-warning'.
253 253
254GROUP should be a custom group name (a symbol). 254GROUP should be a custom group name (a symbol).
255or else a list of symbols whose first element is a custom group name. 255or else a list of symbols whose first element is a custom group name.
@@ -267,7 +267,7 @@ LEVEL should be either :warning, :error, or :emergency.
267(defun warn (message &rest args) 267(defun warn (message &rest args)
268 "Display a warning message made from (format MESSAGE ARGS...). 268 "Display a warning message made from (format MESSAGE ARGS...).
269Aside from generating the message with `format', 269Aside from generating the message with `format',
270this is equivalent to `display-message', using 270this is equivalent to `display-warning', using
271`emacs' as the group and `:warning' as the level." 271`emacs' as the group and `:warning' as the level."
272 (display-warning 'emacs (apply 'format message args))) 272 (display-warning 'emacs (apply 'format message args)))
273 273