diff lisp/gnus/gnus-async.el @ 88155:d7ddb3e565de

sync with trunk

--- a/lisp/gnus/gnus-async.el	Sun Jan 15 23:02:10 2006 +0000
+++ b/lisp/gnus/gnus-async.el	Mon Jan 16 00:03:54 2006 +0000
@@ -1,5 +1,7 @@
 ;;; 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, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <[e-mail]>
 ;; Keywords: news
@@ -18,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -31,16 +33,14 @@
 (require 'gnus-sum)
 (require 'nntp)
 
+(eval-when-compile
+  (when (featurep 'xemacs)
+    (require 'timer-funcs)))
+
 (defgroup gnus-asynchronous nil
   "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 +50,12 @@
 		 (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 +282,16 @@
 	  ;; 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
@@ -372,4 +379,5 @@
 
 (provide 'gnus-async)
 
+;;; arch-tag: fee61de5-3ea2-4de6-8578-2f90ce89391d
 ;;; gnus-async.el ends here