2000-11-20 15:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* gnus-agent.el (gnus-agent-expire): Ignore corrupted history.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cc65177..7d6ee3b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-20 15:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-agent.el (gnus-agent-expire): Ignore corrupted history.
+
 2000-11-20 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-art.el (gnus-article-describe-key): New function.

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 2e97d82..1f5d756 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -1524,7 +1524,17 @@ The following commands are available:
              (goto-char (point-min))
              (while (not (eobp))
                (skip-chars-forward "^\t")
-               (if (> (read (current-buffer)) day)
+               (if (let ((fetch-date (read (current-buffer))))
+                     (if (numberp fetch-date)
+                         (>  fetch-date day)
+                       ;; History file is corrupted.
+                       (gnus-message 
+                        5 
+                        (format "File %s is corrupted!"
+                                (gnus-agent-lib-file "history")))
+                       (sit-for 1)
+                       ;; Ignore it
+                       t))
                    ;; New article; we don't expire it.
                    (forward-line 1)
                  ;; Old article.  Schedule it for possible nuking.