2 files changed, 8 insertions, 2 deletions

diff --git a/doc/lispref/ChangeLog.trunk b/doc/lispref/ChangeLog.trunk
index c705aae4934..1eb3cfa2556 100644
--- a/doc/lispref/ChangeLog.trunk
+++ b/doc/lispref/ChangeLog.trunk
@@ -1,3 +1,8 @@
+2011-03-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * commands.texi (Command Overview): post-command-hook is not reset to
+        nil any more.
+
 2011-03-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * strings.texi (String Conversion): Don't mention
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index 4f8d554a68b..eb42ddb11a4 100644
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -91,8 +91,9 @@ and also when the command loop is first entered.  At that time,
 
   Quitting is suppressed while running @code{pre-command-hook} and
 @code{post-command-hook}.  If an error happens while executing one of
-these hooks, it terminates execution of the hook, and clears the hook
-variable to @code{nil} so as to prevent an infinite loop of errors.
+these hooks, it does not terminate execution of the hook; instead
+the error is silenced and the function in which the error occurred
+is removed from the hook.
 
   A request coming into the Emacs server (@pxref{Emacs Server,,,
 emacs, The GNU Emacs Manual}) runs these two hooks just as a keyboard