Synch to No Gnus 200408240654.

[elisp/gnus.git-] / lisp / legacy-gnus-agent.el

diff --git a/lisp/legacy-gnus-agent.el b/lisp/legacy-gnus-agent.el
index a09bfa4..41c69b7 100644 (file)
--- a/lisp/legacy-gnus-agent.el
+++ b/lisp/legacy-gnus-agent.el
@@ -10,7 +10,7 @@
   "Iterates over all agentview files to ensure that they have been
 converted to the compressed format."
 
-  (let ((search-in '(gnus-agent-directory))
+  (let ((search-in (list gnus-agent-directory))
         here
         members
         member
@@ -18,8 +18,10 @@ converted to the compressed format."
     (while (setq here (pop search-in))
       (setq members (directory-files here t))
       (while (setq member (pop members))
-        (cond ((file-directory-p member)
-               (push member search-in))
+        (cond ((string-match "/\\.\\.?$" member)
+              nil)
+             ((file-directory-p member)
+              (push member search-in))
               ((equal (file-name-nondirectory member) ".agentview")
                (setq converted-something 
                      (or (gnus-agent-convert-agentview member)
@@ -107,7 +109,7 @@ converted to the compressed format."
             (set-buffer buffer)
             (erase-buffer)
             (insert "The definition of gnus-agent-expire-days has been changed.\nYou currently have it set to the list:\n  ")
-            (let (print-level print-length) (pp gnus-agent-expire-days (current-buffer)))
+            (gnus-pp gnus-agent-expire-days)
 
             (insert "\nIn order to use version '" converting-to "' of gnus, you will need to set\n")
             (insert "gnus-agent-expire-days to an integer. If you still wish to set different\n")