X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fnnagent.el;h=21b9f97f0a1af60f58c4ecf05a95b32bcefc53e6;hb=9b741e050b400987d68ff761c6cc3276c932839c;hp=c77b91fd3df8e33617ca98249f96c497dfa66e8e;hpb=a11d0d4325eca973c6565284bed620128a63fcef;p=elisp%2Fgnus.git-

diff --git a/lisp/nnagent.el b/lisp/nnagent.el
index c77b91f..21b9f97 100644
--- a/lisp/nnagent.el
+++ b/lisp/nnagent.el
@@ -130,30 +130,35 @@
 
 (deffoo nnagent-retrieve-headers (articles &optional group server fetch-old)
   (let ((file (gnus-agent-article-name ".overview" group))
-	arts n)
+	arts n first)
     (save-excursion
       (gnus-agent-load-alist group)
-      (setq arts (gnus-set-difference articles 
-				      (mapcar 'car gnus-agent-article-alist)))
+      (setq arts (gnus-sorted-difference
+		  articles (mapcar 'car gnus-agent-article-alist)))
+      ;; Assume that articles with smaller numbers than the first one
+      ;; Agent knows are gone.
+      (setq first (caar gnus-agent-article-alist))
+      (when first 
+	(while (and arts (< (car arts) first))
+	  (pop arts)))
       (set-buffer nntp-server-buffer)
       (erase-buffer)
-      (nnheader-insert-file-contents file)
-      (goto-char (point-min)) 
-      (while (and arts (not (eobp)))
-	(cond 
-	 ((looking-at "[0-9]")
+      (nnheader-insert-nov-file file (car articles))
+      (goto-char (point-min))
+      (gnus-parse-without-error
+	(while (and arts (not (eobp)))
 	  (setq n (read (current-buffer)))
-	  (if (> n (car arts))
-	      (beginning-of-line))
+	  (when (> n (car arts))
+	    (beginning-of-line))
 	  (while (and arts (> n (car arts)))
-	    (insert (format 
+	    (insert (format
 		     "%d\t[Undownloaded article %d]\tGnus Agent\t\t\t\n"
 		     (car arts) (car arts)))
 	    (pop arts))
-	  (if (and arts (= n (car arts)))
-	    (pop arts))))
-	(forward-line 1))
-      (while (and arts)
+	  (when (and arts (= n (car arts)))
+	    (pop arts))
+	  (forward-line 1)))
+      (while arts
 	(insert (format
 		 "%d\t[Undownloaded article %d]\tGnus Agent\t\t\t\n"
 		 (car arts) (car arts)))
@@ -168,6 +173,9 @@
 	t)
       'nov)))
 
+(deffoo nnagent-request-expire-articles (articles group &optional server force)
+  articles)
+
 (deffoo nnagent-request-group (group &optional server dont-check)
   (nnoo-parent-function 'nnagent 'nnml-request-group
 			(list group (nnagent-server server) dont-check)))
@@ -192,10 +200,6 @@
   (nnoo-parent-function 'nnagent 'nnml-request-delete-group
 			(list group force (nnagent-server server))))
 
-(deffoo nnagent-request-expire-articles (articles group &optional server force)
-  (nnoo-parent-function 'nnagent 'nnml-request-expire-articles
-			(list articles group (nnagent-server server) force)))
-
 (deffoo nnagent-request-list (&optional server)
   (nnoo-parent-function 'nnagent 'nnml-request-list
 			(list (nnagent-server server))))