* gnus-start.el (gnus-convert-old-newsrc): Fixed numeric

[gnus] / lisp / nnagent.el

diff --git a/lisp/nnagent.el b/lisp/nnagent.el
index 86c23d6..5d5cd2a 100644 (file)
--- a/lisp/nnagent.el
+++ b/lisp/nnagent.el
@@ -103,7 +103,7 @@
 
 (defun nnagent-request-type (group article)
   (unless (stringp article)
-    (let ((gnus-plugged t))
+    (let ((gnus-agent nil))
       (if (not (gnus-check-backend-function
                'request-type (car gnus-command-method)))
          'unknown
@@ -122,44 +122,47 @@
 
 (deffoo nnagent-request-set-mark (group action server)
   (with-temp-buffer
-    (insert (format "(%s-request-set-mark \"%s\" '%s \"%s\")\n"
-                   (nth 0 gnus-command-method) group action
-                   (or server (nth 1 gnus-command-method))))
+    (insert "(gnus-agent-synchronize-group-flags \""
+           group 
+           "\" '")
+    (gnus-pp action)
+    (insert " \""
+           (gnus-method-to-server gnus-command-method)
+           "\"")
+    (insert ")\n")
     (append-to-file (point-min) (point-max) (gnus-agent-lib-file "flags")))
   nil)
 
 (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)
+      (nnheader-insert-nov-file file (car articles))
       (goto-char (point-min))
-      ;; This loop is just for the `condition-case' -- if reading bugs
-      ;; out on a line, it'll still continue on to the next line.  So
-      ;; this look is normally just executed once.
-      (while (not (eobp))
-       (condition-case ()
-           (while arts
-             (setq n (read (current-buffer)))
-             (if (> n (car arts))
-                 (beginning-of-line))
-             (while (and arts (> n (car arts)))
-               (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))
-         (error
-          (gnus-error 4 "Strange nov line (%d)"
-                      (count-lines (point-min) (point)))))
-       (forward-line 1))
+      (gnus-parse-without-error
+       (while (and arts (not (eobp)))
+         (setq n (read (current-buffer)))
+         (when (> n (car arts))
+           (beginning-of-line))
+         (while (and arts (> n (car arts)))
+           (insert (format
+                    "%d\t[Undownloaded article %d]\tGnus Agent\t\t\t\n"
+                    (car arts) (car arts)))
+           (pop 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"
@@ -175,6 +178,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)))
@@ -199,10 +205,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))))
@@ -212,10 +214,10 @@
                        (list (nnagent-server server))))
 
 (deffoo nnagent-request-move-article
-    (article group server accept-form &optional last)
+    (article group server accept-form &optional last move-is-internal)
   (nnoo-parent-function 'nnagent 'nnml-request-move-article
                        (list article group (nnagent-server server)
-                             accept-form last)))
+                             accept-form last move-is-internal)))
 
 (deffoo nnagent-request-rename-group (group new-name &optional server)
   (nnoo-parent-function 'nnagent 'nnml-request-rename-group
@@ -250,4 +252,5 @@
 
 (provide 'nnagent)
 
+;;; arch-tag: af710b77-f816-4969-af31-6fd94fb42245
 ;;; nnagent.el ends here