Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fa0bfee..ea41af0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-09  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-agent.el (gnus-agent-braid-nov): Remove corrupted lines.
+       Because of an unknown bug, the group buffer is saved in .overview
+       file.
+
 2002-12-09  Kai Gro\e,A_\e(Bjohann  <kai.grossjohann@uni-duisburg.de>
 
        * nntp.el (nntp-send-command): Braino in last commit.  Replace

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 7aeb369..22773e3 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -1242,10 +1242,18 @@ of FILE placing the combined headers in nntp-server-buffer."
     (erase-buffer)
     (nnheader-insert-file-contents file)
     (goto-char (point-max))
+    (forward-line -1)
+    (unless (looking-at "[0-9]+\t")
+      ;; Remove corrupted lines
+      (gnus-message 1 "Overview %s is corrupted. Removing corrupted lines..." file)
+      (goto-char (point-min))
+      (while (not (eobp))
+       (if (looking-at "[0-9]+\t")
+           (forward-line 1)
+         (delete-region (point) (progn (forward-line 1) (point)))))
+      (forward-line -1))
     (unless (or (= (point-min) (point-max))
-               (progn
-                 (forward-line -1)
-                 (< (setq last (read (current-buffer))) (car articles))))
+               (< (setq last (read (current-buffer))) (car articles)))
       ;; We do it the hard way.
       (when (nnheader-find-nov-line (car articles))
         ;; Replacing existing NOV entry