4 files changed, 16 insertions, 3 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index c77e1f1c847..f11d65acc79 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-07  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * gnus.texi (Interactive): Explain effect of gnus-expert-user better.
+
 2010-05-26  Michael Albinus  <michael.albinus@gmx.de>
 
         * eshell.texi (Built-ins): Describe, how to disable a built-in command
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 585c4d6bcb8..3ef173c8db0 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -22906,8 +22906,11 @@ default.
 @item gnus-expert-user
 @vindex gnus-expert-user
 If this variable is non-@code{nil}, you will seldom be asked any
-questions by Gnus.  It will simply assume you know what you're doing, no
-matter how strange.
+questions by Gnus.  It will simply assume you know what you're doing,
+no matter how strange.  For example, quitting Gnus, exiting a group
+without an update, catching up with a group, deleting expired
+articles, and replying by mail to a news message will not require
+confirmation.
 
 @item gnus-interactive-catchup
 @vindex gnus-interactive-catchup
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