Synch with Gnus trunk.

2010-06-07  Teodor Zlatanov  <tzz@lifelogs.com>
 * gnus.texi (Interactive): Explain effect of gnus-expert-user better.

2010-06-07  Teemu Likonen  <tlikonen@iki.fi>  (tiny change)
 * gnus-agent.el (gnus-agent-expire-unagentized-dirs): Don't ask about
 deleting unused directories when gnus-expert-user is t.

2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index c90e7c7a9eb..3ab4ed98aca 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-07  Teemu Likonen  <tlikonen@iki.fi>  (tiny change)
+
+        * gnus-agent.el (gnus-agent-expire-unagentized-dirs): Don't ask about
+        deleting unused directories when gnus-expert-user is t.
+
 2010-06-02  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-art.el (gnus-article-browse-delete-temp-files): Don't make query
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 17f1d0cdb1f..edc4e0f3bef 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -3634,7 +3634,8 @@ articles in every agentized group? "))
  deleting them?")))
           (while to-remove
             (let ((dir (pop to-remove)))
-              (if (gnus-y-or-n-p (format "Delete %s? " dir))
+              (if (or gnus-expert-user
+                      (gnus-y-or-n-p (format "Delete %s? " dir)))
                   (let* (delete-recursive
                          files f
                          (delete-recursive