aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-02-08 16:20:12 -0800
committerGlenn Morris2014-02-08 16:20:12 -0800
commit2abd71e50cee30d491910af87c141cd0f1807188 (patch)
tree1279b72f91f483c85b46e41f0e5530c93da4659a
parentc1b5900bc06f22bd6e8c94c72ca735402b225c04 (diff)
downloademacs-2abd71e50cee30d491910af87c141cd0f1807188.tar.gz
emacs-2abd71e50cee30d491910af87c141cd0f1807188.zip
* lisp/emacs-lisp/warnings.el (lwarn): Empower help-enable-auto-load.
Fixes: debbugs:15940
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/warnings.el3
2 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 22e541fce3f..493a3d13ad8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-02-09 Glenn Morris <rgm@gnu.org>
2
3 * emacs-lisp/warnings.el (lwarn):
4 Empower help-enable-auto-load. (Bug#15940)
5
12014-02-08 Andreas Schwab <schwab@linux-m68k.org> 62014-02-08 Andreas Schwab <schwab@linux-m68k.org>
2 7
3 * vc/log-edit.el (log-edit-comment-to-change-log): Doc fix. 8 * vc/log-edit.el (log-edit-comment-to-change-log): Doc fix.
diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el
index 80c990a16cc..49b11e9d5d6 100644
--- a/lisp/emacs-lisp/warnings.el
+++ b/lisp/emacs-lisp/warnings.el
@@ -306,9 +306,12 @@ See also `warning-series', `warning-prefix-function' and
306 (set-window-start window warning-series)) 306 (set-window-start window warning-series))
307 (sit-for 0)))))))) 307 (sit-for 0))))))))
308 308
309;; Use \\<special-mode-map> so that help-enable-auto-load can do its thing.
310;; Any keymap that is defined will do.
309;;;###autoload 311;;;###autoload
310(defun lwarn (type level message &rest args) 312(defun lwarn (type level message &rest args)
311 "Display a warning message made from (format MESSAGE ARGS...). 313 "Display a warning message made from (format MESSAGE ARGS...).
314\\<special-mode-map>
312Aside from generating the message with `format', 315Aside from generating the message with `format',
313this is equivalent to `display-warning'. 316this is equivalent to `display-warning'.
314 317