[Emacs-diffs] /srv/bzr/emacs/trunk r107043: Merge change(s) made in Gnus no-gnus branch

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 107043
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2012-02-01 09:00:42 +0000
message:
  Merge change(s) made in Gnus no-gnus branch
  
  2012-01-31  Jim Meyering  <address@hidden>
   gnus-agent.el (gnus-agent-expire-unagentized-dirs):
   Correct a comment (insert "not") and hide nominally-doubled "to".
modified:
  doc/misc/ChangeLog
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-agent.el

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2012-01-28 19:16:02 +0000
+++ b/doc/misc/ChangeLog        2012-02-01 09:00:42 +0000
@@ -1,3 +1,8 @@
+2012-01-30  Philipp Haselwarter  <address@hidden>  (tiny change)
+
+       * gnus.texi (Agent Basics): Fix outdated description of
+       `gnus-agent-auto-agentize-methods'.
+
 2012-01-28  Andreas Schwab  <address@hidden>
 
        * cc-mode.texi: Always @defindex ss.

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-01-31 16:15:03 +0000
+++ b/lisp/gnus/ChangeLog       2012-02-01 09:00:42 +0000
@@ -1,3 +1,8 @@
+2012-01-31  Jim Meyering  <address@hidden>
+
+       * gnus-agent.el (gnus-agent-expire-unagentized-dirs):
+       Correct a comment (insert "not") and hide nominally-doubled "to".
+
 2012-01-30  Philipp Haselwarter  <address@hidden>  (tiny change)
 
        * gnus-agent.el (gnus-agent-auto-agentize-methods): Point to the Agent

=== modified file 'lisp/gnus/gnus-agent.el'
--- a/lisp/gnus/gnus-agent.el   2012-01-30 23:30:22 +0000
+++ b/lisp/gnus/gnus-agent.el   2012-02-01 09:00:42 +0000
@@ -3618,7 +3618,7 @@
                                 (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)))