From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Tue, 7 Sep 2010 00:04:11 +0000 (+0000)
Subject: nntp.el (nntp-wait-for-string): Supply a timeout for accept-process-output to ensure... 
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~48^2~47
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d832b437121824695a25b2b8e01e143545100508;p=emacs.git

nntp.el (nntp-wait-for-string): Supply a timeout for accept-process-output to ensure progress.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7bd62149c95..f2e48fc5782 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,8 @@
 2010-09-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* nntp.el (nntp-wait-for-string): Supply a timeout for
+	accept-process-output to ensure progress.
+
 	* gnus-start.el (gnus-get-unread-articles): If being given an explicit
 	level to get unread articles from, then use that for foreign groups,
 	too.
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 5373230fd8e..3cdd63084ef 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -1768,7 +1768,7 @@ password contained in '~/.nntp-authinfo'."
     (while (and (setq proc (get-buffer-process buf))
 		(memq (process-status proc) '(open run))
 		(not (re-search-forward regexp nil t)))
-      (accept-process-output proc)
+      (accept-process-output proc 0.1)
       (set-buffer buf)
       (goto-char (point-min)))))
 
diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el
index 0e4576ae3f5..0e32e934040 100644
--- a/lisp/gnus/spam-report.el
+++ b/lisp/gnus/spam-report.el
@@ -267,7 +267,7 @@ This is initialized based on `user-mail-address'."
 	(gnus-message 7 "Waiting for response from %s..." host)
 	(while (and (memq (process-status tcp-connection) '(open run))
 		    (zerop (buffer-size)))
-	  (accept-process-output tcp-connection))
+	  (accept-process-output tcp-connection 1))
 	(gnus-message 7 "Waiting for response from %s... done" host)))))
 
 ;;;###autoload
diff --git a/lisp/mail/hashcash.el b/lisp/mail/hashcash.el
index a10db0194fc..cc3af11a47d 100644
--- a/lisp/mail/hashcash.el
+++ b/lisp/mail/hashcash.el
@@ -276,7 +276,7 @@ BUFFER defaults to the current buffer."
   (unless buffer (setq buffer (current-buffer)))
   (let (entry)
     (while (setq entry (rassq buffer hashcash-process-alist))
-      (accept-process-output (car entry)))))
+      (accept-process-output (car entry) 1))))
 
 (defun hashcash-processes-running-p (buffer)
   "Return non-nil if hashcash processes in BUFFER are still running."