Be a bit more lax in finding the end of the command we're looking for.

This helps when the server sends more responses after we've gotten
everything we expected.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a401713..2278db3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,9 @@
        (nnimap-request-group): Don't make `M-g' bug out on group with no
        marks.
        (nnoo): Required, so that other packages can require nnimap.
+       (nnimap-wait-for-response): Be a bit more lax in finding the end of the
+       command we're looking for.  This helps when the server sends more
+       responses after we've gotten everything we expected.
 
 2010-09-18  Julien Danjou  <julien@danjou.info>
 

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 63b468c..2a83bde 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -811,10 +811,9 @@ not done by default on servers that doesn't support that command.")
 
 (defun nnimap-wait-for-response (sequence &optional messagep)
   (goto-char (point-max))
-  (while (or (bobp)
-            (progn
-              (forward-line -1)
-              (not (looking-at (format "^%d .*\n" sequence)))))
+  (while (not (re-search-backward (format "^%d .*\n" sequence)
+                                 (max (point-min) (- (point) 500))
+                                 t))
     (when messagep
       (message "Read %dKB" (/ (buffer-size) 1000)))
     (nnheader-accept-process-output (get-buffer-process (current-buffer)))