2 files changed, 8 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 66d9a6725ed..74f218aa4bd 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-agent.el (gnus-agentize): Only do the auto-agentizing if
+        gnus-agent-auto-agentize-methods is set.  Which it isn't.
+
 2010-11-15  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-sum.el (gnus-summary-move-article): Fix `while' loop to make it
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 3597037236b..8edfecde152 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -695,7 +695,9 @@ minor mode in all Gnus buffers."
   ;; If the servers file doesn't exist, auto-agentize some servers and
   ;; save the servers file so this auto-agentizing isn't invoked
   ;; again.
-  (unless (file-exists-p (nnheader-concat gnus-agent-directory "lib/servers"))
+  (when (and (not (file-exists-p (nnheader-concat
+                                  gnus-agent-directory "lib/servers")))
+             gnus-agent-auto-agentize-methods)
     (gnus-message 3 "First time agent user, agentizing remote groups...")
     (mapc
      (lambda (server-or-method)