Merge from trunk

5 files changed, 18 insertions, 3 deletions

diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index ae142dba6e6..aca17ce817d 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -111,7 +111,7 @@ EMACSSOURCES= \
 
 ## This seems pointless.  The info/ directory exists in both the
 ## repository and the release tarfiles.  We do not use any
-## equivalent of mkdir -p/mkinstalldirs, so this is not a general
+## equivalent of mkdir -p/install-sh -d, so this is not a general
 ## solution anyway.  The second test -d is for parallel builds.
 mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
 
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
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 50f0e4e45b9..1c29d2598a8 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-19  Antoine Levitt  <antoine.levitt@gmail.com>
+
+	* gnus.texi (Listing Groups): Document gnus-group-list-ticked
+
 2011-03-17  Jay Belanger  <jay.p.belanger@gmail.com>
 
 	* calc.texi (Logarithmic Units): Update the function names.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index b55452cfa82..9771392f0cc 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -3320,6 +3320,11 @@ List all groups with cached articles (@code{gnus-group-list-cached}).
 @findex gnus-group-list-dormant
 List all groups with dormant articles (@code{gnus-group-list-dormant}).
 
+@item A !
+@kindex A ! (Group)
+@findex gnus-group-list-ticked
+List all groups with ticked articles (@code{gnus-group-list-ticked}).
+
 @item A /
 @kindex A / (Group)
 @findex gnus-group-list-limit