X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;ds=inline;f=lisp%2Fgnus-async.el;h=e6616588cd64731f8ab97b0ff6d86b3054c6641a;hb=fbb493f9afd70ead7e736b7e8244796d76db5cfc;hp=64ad755b0963452b17f90c6af72dbf5acc60d8c7;hpb=270af910f44a6418d5a43bbcb544e2e52b865320;p=gnus

diff --git a/lisp/gnus-async.el b/lisp/gnus-async.el
index 64ad755b0..e6616588c 100644
--- a/lisp/gnus-async.el
+++ b/lisp/gnus-async.el
@@ -1,5 +1,5 @@
 ;;; gnus-async.el --- asynchronous support for Gnus
-;; Copyright (C) 1996,97,98 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -35,7 +35,7 @@
   "Support for asynchronous operations."
   :group 'gnus)
 
-(defcustom gnus-asynchronous t
+(defcustom gnus-asynchronous nil
   "*If nil, inhibit all Gnus asynchronicity.
 If non-nil, let the other asynch variables be heeded."
   :group 'gnus-asynchronous
@@ -80,6 +80,7 @@ It should return non-nil if the article is to be prefetched."
 (defvar gnus-async-hashtb nil)
 (defvar gnus-async-current-prefetch-group nil)
 (defvar gnus-async-current-prefetch-article nil)
+(defvar gnus-async-timer nil)
 
 (defvar gnus-async-prefetch-headers-buffer " *Async Prefetch Headers*")
 (defvar gnus-async-header-prefetched nil)
@@ -146,49 +147,54 @@ It should return non-nil if the article is to be prefetched."
 	      ;; do this, which leads to slightly slower article
 	      ;; buffer display.
 	      (gnus-async-prefetch-article group next summary)
-	    (run-with-idle-timer
-	     0.1 nil 'gnus-async-prefetch-article group next summary)))))))
+	    (when gnus-async-timer
+	      (ignore-errors
+		(nnheader-cancel-timer 'gnus-async-timer)))
+	    (setq gnus-async-timer
+		  (run-with-idle-timer
+		   0.1 nil 'gnus-async-prefetch-article
+		   group next summary))))))))
 
 (defun gnus-async-prefetch-article (group article summary &optional next)
   "Possibly prefetch several articles starting with ARTICLE."
   (if (not (gnus-buffer-live-p summary))
       (gnus-async-with-semaphore
-       (setq gnus-async-fetch-list nil))
+	(setq gnus-async-fetch-list nil))
     (when (and gnus-asynchronous
 	       (gnus-alive-p))
       (when next
 	(gnus-async-with-semaphore
-	 (pop gnus-async-fetch-list)))
+	  (pop gnus-async-fetch-list)))
       (let ((do-fetch next)
-	    (do-message t)) ;(eq major-mode 'gnus-summary-mode)))
+	    (do-message t))		;(eq major-mode 'gnus-summary-mode)))
 	(when (and (gnus-group-asynchronous-p group)
 		   (gnus-buffer-live-p summary)
 		   (or (not next)
 		       gnus-async-fetch-list))
 	  (gnus-async-with-semaphore
-	   (unless next
-	     (setq do-fetch (not gnus-async-fetch-list))
-	     ;; Nix out any outstanding requests.
-	     (setq gnus-async-fetch-list nil)
-	     ;; Fill in the new list.
-	     (let ((n gnus-use-article-prefetch)
-		   (data (gnus-data-find-list article))
-		   d)
-	       (while (and (setq d (pop data))
-			   (if (numberp n)
-			       (natnump (decf n))
-			     n))
-		 (unless (or (gnus-async-prefetched-article-entry
-			      group (setq article (gnus-data-number d)))
-			     (not (natnump article))
-			     (not (funcall gnus-async-prefetch-article-p d)))
-		   ;; Not already fetched -- so we add it to the list.
-		   (push article gnus-async-fetch-list)))
-	       (setq gnus-async-fetch-list
-		     (nreverse gnus-async-fetch-list))))
-
-	   (when do-fetch
-	     (setq article (car gnus-async-fetch-list))))
+	    (unless next
+	      (setq do-fetch (not gnus-async-fetch-list))
+	      ;; Nix out any outstanding requests.
+	      (setq gnus-async-fetch-list nil)
+	      ;; Fill in the new list.
+	      (let ((n gnus-use-article-prefetch)
+		    (data (gnus-data-find-list article))
+		    d)
+		(while (and (setq d (pop data))
+			    (if (numberp n)
+				(natnump (decf n))
+			      n))
+		  (unless (or (gnus-async-prefetched-article-entry
+			       group (setq article (gnus-data-number d)))
+			      (not (natnump article))
+			      (not (funcall gnus-async-prefetch-article-p d)))
+		    ;; Not already fetched -- so we add it to the list.
+		    (push article gnus-async-fetch-list)))
+		(setq gnus-async-fetch-list
+		      (nreverse gnus-async-fetch-list))))
+
+	    (when do-fetch
+	      (setq article (car gnus-async-fetch-list))))
 
 	  (when (and do-fetch article)
 	    ;; We want to fetch some more articles.
@@ -222,16 +228,16 @@ It should return non-nil if the article is to be prefetched."
     (when arg
       (gnus-async-set-buffer)
       (gnus-async-with-semaphore
-       (setq
-	gnus-async-article-alist
-	(cons (list (intern (format "%s-%d" group article)
-			    gnus-async-hashtb)
-		    mark (set-marker (make-marker) (point-max))
-		    group article)
-	      gnus-async-article-alist))))
+	(setq
+	 gnus-async-article-alist
+	 (cons (list (intern (format "%s-%d" group article)
+			     gnus-async-hashtb)
+		     mark (set-marker (make-marker) (point-max))
+		     group article)
+	       gnus-async-article-alist))))
     (if (not (gnus-buffer-live-p summary))
 	(gnus-async-with-semaphore
-	 (setq gnus-async-fetch-list nil))
+	  (setq gnus-async-fetch-list nil))
       (gnus-async-prefetch-article group next summary t))))
 
 (defun gnus-async-unread-p (data)
@@ -291,8 +297,8 @@ It should return non-nil if the article is to be prefetched."
     (set-marker (cadr entry) nil)
     (set-marker (caddr entry) nil))
   (gnus-async-with-semaphore
-   (setq gnus-async-article-alist
-	 (delq entry gnus-async-article-alist))))
+    (setq gnus-async-article-alist
+	  (delq entry gnus-async-article-alist))))
 
 (defun gnus-async-prefetch-remove-group (group)
   "Remove all articles belonging to GROUP from the prefetch buffer."