Synch to No Gnus 200409302248.

[elisp/gnus.git-] / lisp / gnus-async.el

diff --git a/lisp/gnus-async.el b/lisp/gnus-async.el
index e661658..86086a2 100644 (file)
--- a/lisp/gnus-async.el
+++ b/lisp/gnus-async.el
@@ -1,5 +1,6 @@
 ;;; gnus-async.el --- asynchronous support for Gnus
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2003
+;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -35,12 +36,6 @@
   "Support for asynchronous operations."
   :group 'gnus)
 
-(defcustom gnus-asynchronous nil
-  "*If nil, inhibit all Gnus asynchronicity.
-If non-nil, let the other asynch variables be heeded."
-  :group 'gnus-asynchronous
-  :type 'boolean)
-
 (defcustom gnus-use-article-prefetch 30
   "*If non-nil, prefetch articles in groups that allow this.
 If a number, prefetch only that many articles forward;
@@ -50,6 +45,12 @@ if t, prefetch as many articles as possible."
                 (const :tag "all" t)
                 (integer :tag "some" 0)))
 
+(defcustom gnus-asynchronous nil
+  "*If nil, inhibit all Gnus asynchronicity.
+If non-nil, let the other asynch variables be heeded."
+  :group 'gnus-asynchronous
+  :type 'boolean)
+
 (defcustom gnus-prefetched-article-deletion-strategy '(read exit)
   "List of symbols that say when to remove articles from the prefetch buffer.
 Possible values in this list are `read', which means that
@@ -276,15 +277,16 @@ It should return non-nil if the article is to be prefetched."
          ;; needs to be done in nntp.el.
          (while (eq article gnus-async-current-prefetch-article)
            (incf tries)
-           (when (nntp-accept-process-output proc 1)
+           (when (nntp-accept-process-output proc)
              (setq tries 0))
-           (when (and (not nntp-have-messaged) (eq 3 tries))
+           (when (and (not nntp-have-messaged)
+                      (= tries 3))
              (gnus-message 5 "Waiting for async article...")
              (setq nntp-have-messaged t)))
        (quit
         ;; if the user interrupted on a slow/hung connection,
         ;; do something friendly.
-        (when (< 3 tries)
+        (when (> tries 3)
           (setq gnus-async-current-prefetch-article nil))
         (signal 'quit nil)))
       (when nntp-have-messaged
@@ -304,13 +306,11 @@ It should return non-nil if the article is to be prefetched."
   "Remove all articles belonging to GROUP from the prefetch buffer."
   (when (and (gnus-group-asynchronous-p group)
             (memq 'exit gnus-prefetched-article-deletion-strategy))
-    (let ((alist gnus-async-article-alist))
-      (save-excursion
-       (gnus-async-set-buffer)
-       (while alist
-         (when (equal group (nth 3 (car alist)))
-           (gnus-async-delete-prefetched-entry (car alist)))
-         (pop alist))))))
+    (save-excursion
+      (gnus-async-set-buffer)
+      (dolist (entry gnus-async-article-alist)
+       (when (equal group (nth 3 entry))
+         (gnus-async-delete-prefetched-entry entry))))))
 
 (defun gnus-async-prefetched-article-entry (group article)
   "Return the entry for ARTICLE in GROUP iff it has been prefetched."