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 @@
+2014-02-09  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/warnings.el (lwarn):
+        Empower help-enable-auto-load.  (Bug#15940)
+
 2014-02-08  Andreas Schwab  <schwab@linux-m68k.org>
 
         * 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
                        (set-window-start window warning-series))
                      (sit-for 0))))))))
 
+;; Use \\<special-mode-map> so that help-enable-auto-load can do its thing.
+;; Any keymap that is defined will do.
 ;;;###autoload
 (defun lwarn (type level message &rest args)
   "Display a warning message made from (format MESSAGE ARGS...).
+\\<special-mode-map>
 Aside from generating the message with `format',
 this is equivalent to `display-warning'.