[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-async.el,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     07/10/28 09:18:40

Index: lisp/gnus/gnus-async.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/gnus-async.el,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- lisp/gnus/gnus-async.el     13 Aug 2007 13:41:18 -0000      1.15
+++ lisp/gnus/gnus-async.el     28 Oct 2007 09:18:29 -0000      1.16
@@ -33,10 +33,6 @@
 (require 'gnus-sum)
 (require 'nntp)
 
-(eval-when-compile
-  (when (featurep 'xemacs)
-    (require 'timer-funcs)))
-
 (defgroup gnus-asynchronous nil
   "Support for asynchronous operations."
   :group 'gnus)
@@ -274,6 +270,7 @@
          (nntp-server-buffer (current-buffer))
          (nntp-have-messaged nil)
          (tries 0))
+      (when proc
       (condition-case nil
          ;; FIXME: we could stop waiting after some
          ;; timeout, but this is the wrong place to do it.
@@ -295,7 +292,7 @@
           (setq gnus-async-current-prefetch-article nil))
         (signal 'quit nil)))
       (when nntp-have-messaged
-       (gnus-message 5 "")))))
+         (gnus-message 5 ""))))))
 
 (defun gnus-async-delete-prefetched-entry (entry)
   "Delete ENTRY from buffer and alist."
@@ -311,13 +308,11 @@
   "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))))))
+      (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 if it has been prefetched."