* gnus-agent.el (directory-files-and-attributes): Move all the way

	forward (the third and final move).
	(gnus-agent-read-agentview): Trap reconstruction errors due to
	nonexistant directory.  Handle by returning nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f891a92..9a38421 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-30  Kevin Greiner  <kevin.greiner@compsol.cc>
+
+       * gnus-agent.el (directory-files-and-attributes): Move all the way
+       forward (the third and final move).
+       (gnus-agent-read-agentview): Trap reconstruction errors due to
+       nonexistant directory.  Handle by returning nil.
+
 2006-05-30  Didier Verna  <didier@xemacs.org>
 
        * message.el (message-dont-reply-to-names): Update the custom type.

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 66b10f5..8940405 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -259,6 +259,16 @@ NOTES:
 (defvar gnus-headers)
 (defvar gnus-score)
 
+;; Added to support XEmacs
+(eval-and-compile
+  (unless (fboundp 'directory-files-and-attributes)
+    (defun directory-files-and-attributes (directory
+                                          &optional full match nosort)
+      (let (result)
+       (dolist (file (directory-files directory full match nosort))
+         (push (cons file (file-attributes file)) result))
+       (nreverse result)))))
+
 ;;;
 ;;; Setup
 ;;;
@@ -449,16 +459,6 @@ manipulated as follows:
 (defsubst gnus-agent-cat-make (name &optional default-agent-predicate)
   (list name `(agent-predicate . ,(or default-agent-predicate 'false))))
 
-;; Added to support XEmacs
-(eval-and-compile
-  (unless (fboundp 'directory-files-and-attributes)
-    (defun directory-files-and-attributes (directory
-                                          &optional full match nosort)
-      (let (result)
-       (dolist (file (directory-files directory full match nosort))
-         (push (cons file (file-attributes file)) result))
-       (nreverse result)))))
-
 ;;; Fetching setup functions.
 
 (defun gnus-agent-start-fetch ()
@@ -2123,18 +2123,20 @@ doesn't exist, to valid the overview buffer."
                (gnus-agent-save-alist gnus-agent-read-agentview)))
            alist))
       ((end-of-file file-error)
-       ;; The agentview file is missing. Perform a brute-force
-       ;; reconstruction of its contents.
-       (let* (alist
-             (file-attributes (directory-files-and-attributes 
-                               (gnus-agent-article-name ""
-                                                        gnus-agent-read-agentview) nil "^[0-9]+$" t)))
-        (while file-attributes
-          (let* ((fa (pop file-attributes))
-                 (artnum (string-to-number (nth 0 fa)))
-                 (days (time-to-days (nth 5 fa))))
-            (push (cons artnum days) alist)))
-        alist)))))
+       ;; The agentview file is missing. 
+       (condition-case nil
+          ;; If the agent directory exists, attempt to perform a brute-force
+          ;; reconstruction of its contents.
+          (let* (alist
+                 (file-attributes (directory-files-and-attributes 
+                                   (gnus-agent-article-name ""
+                                                            gnus-agent-read-agentview) nil "^[0-9]+$" t)))
+            (while file-attributes
+              (let ((fa (pop file-attributes)))
+                (unless (nth 1 fa)
+                  (push (cons (string-to-number (nth 0 fa)) (time-to-days (nth 5 fa))) alist))))
+            alist)
+        (file-error nil))))))
 
 (defun gnus-agent-save-alist (group &optional articles state)
   "Save the article-state alist for GROUP."