Synch to Gnus 200307071844.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4bd19ff..f4b0379 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2003-07-07  Kai Gro\e,A_\e(Bjohann  <kai.grossjohann@gmx.net>
+
+       * imap.el (imap-wait-for-tag): After the process has died, look
+       for more output still pending.  From Gaute B Strokkenes
+       <gs234@cam.ac.uk>.
+
+2003-07-07  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * spam.el (spam-bogofilter-score): redisplay article normally
+       after spam-bogofilter-score is called
+
 2003-07-06  Jesper Harder  <harder@ifa.au.dk>
 
        * message.el (message-send-mail-with-sendmail): Handle

diff --git a/lisp/imap.el b/lisp/imap.el
index 88dda14..2abeee6 100644 (file)
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -1731,6 +1731,15 @@ on failure."
                                 (truncate (* (- imap-read-timeout
                                                 (truncate imap-read-timeout))
                                              1000)))))
+      ;; Maybe the process has died, but the remote end wants to send
+      ;; some more stuff.
+      (when (and (null imap-continuation)
+                (< imap-reached-tag tag))
+       (accept-process-output imap-process
+                              (truncate imap-read-timeout)
+                              (truncate (* (- imap-read-timeout
+                                              (truncate imap-read-timeout))
+                                           1000))))
       (when imap-have-messaged
        (message ""))
       (and (memq (process-status imap-process) '(open run))

diff --git a/lisp/spam.el b/lisp/spam.el
index b036a3b..895ac5c 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -1067,7 +1067,8 @@ Uses `gnus-newsgroup-name' if category is nil (for ham registration)."
     (let ((score (or (spam-check-bogofilter-headers t)
                     (spam-check-bogofilter t))))
       (message "Spamicity score %s" score)
-      (or score "0"))))
+      (or score "0"))
+    (gnus-summary-show-article)))
 
 (defun spam-check-bogofilter (&optional score)
   "Check the Bogofilter backend for the classification of this message"