Merge change(s) made in Gnus no-gnus branch

2012-01-31  Jim Meyering  <jim@meyering.net>
 gnus-agent.el (gnus-agent-expire-unagentized-dirs):
 Correct a comment (insert "not") and hide nominally-doubled "to".

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index d1a045a730a7aeed7ce84eb1f25e35928e4c113e..6bb1e065d3754e254daf4e164414dfdea108d176 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-30  Philipp Haselwarter  <philipp.haselwarter@gmx.de>  (tiny change)
+
+       * gnus.texi (Agent Basics): Fix outdated description of
+       `gnus-agent-auto-agentize-methods'.
+
 2012-01-28  Andreas Schwab  <schwab@linux-m68k.org>
 
        * cc-mode.texi: Always @defindex ss.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f5e49f70872c313a7287c1b725fd48254b032447..bca84de521b7e3acf5ef099db9c7e06a84a182b9 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-31  Jim Meyering  <jim@meyering.net>
+
+       * gnus-agent.el (gnus-agent-expire-unagentized-dirs):
+       Correct a comment (insert "not") and hide nominally-doubled "to".
+
 2012-01-30  Philipp Haselwarter  <philipp.haselwarter@gmx.de>  (tiny change)
 
        * gnus-agent.el (gnus-agent-auto-agentize-methods): Point to the Agent

diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index d7308758862313fab070ec8e48b559f419f35c2e..5178220af8f034d80f956b4aefc20fe6bfac179b 100644 (file)
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -3618,7 +3618,7 @@ articles in every agentized group? "))
                                 (setq r d
                                       d (directory-file-name d)))
                               ;; if ANY ancestor was NOT in keep hash and
-                              ;; it's already in to-remove, add it to
+                              ;; it's not already in to-remove, add it to
                               ;; to-remove.
                               (if (and r
                                        (not (member r to-remove)))