2 files changed, 8 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4e59dd65b2d..32bdd8630ca 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-04  Chong Yidong  <cyd@gnu.org>
+
+        * subr.el (delayed-warnings-hook): Doc fix.
+
 2012-04-04  Daiki Ueno  <ueno@unixuser.org>
 
         * epa.el (epa--select-keys): Bind C-c C-c to finish the key
diff --git a/lisp/subr.el b/lisp/subr.el
index 514827f9615..497809a23e8 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1893,9 +1893,10 @@ Used from `delayed-warnings-hook' (which see)."
 ;; Ref http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00085.html
 (defvar delayed-warnings-hook '(collapse-delayed-warnings
                                 display-delayed-warnings)
-  "Normal hook run to process delayed warnings.
-Functions in this hook should access the `delayed-warnings-list'
-variable (which see) and remove from it the warnings they process.")
+  "Normal hook run to process and display delayed warnings.
+By default, this hook contains functions to consolidate the
+warnings listed in `delayed-warnings-list', display them, and set
+`delayed-warnings-list' back to nil.")
 
 
 ;;;; Process stuff.