[Emacs-diffs] /srv/bzr/emacs/trunk r107275: nnimap.el (nnimap-transform-headers): Don't bug out on header lines containing stuff that look like IMAP length encodings.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 107275
author: Lars Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2012-02-13 22:18:33 +0000
message:
  nnimap.el (nnimap-transform-headers): Don't bug out on header lines 
containing stuff that look like IMAP length encodings.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/nnimap.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-02-13 14:14:18 +0000
+++ b/lisp/gnus/ChangeLog       2012-02-13 22:18:33 +0000
@@ -3,6 +3,8 @@
        * nnimap.el (nnimap-record-commands): New variable.
        (nnimap-log-command): Use it.
        (nnimap-make-process-buffer): Add a space to the process buffer.
+       (nnimap-transform-headers): Don't bug out on header lines containing
+       stuff that look like IMAP length encodings.
 
        * shr.el (shr-rescale-image): Allow viewing large images.
 
@@ -85,7 +87,7 @@
        have newlines within the strings, and where the UID comes after the
        BODYSTRUCTURE element (bug#10537).
 
-       * shr-color.el (shr-color-set-minimum-interval): Renamed to add prefix
+       * shr-color.el (shr-color-set-minimum-interval): Rename to add prefix
        (bug#10732).
 
        * shr.el (shr-insert-document): Add doc string.

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2012-02-13 14:14:18 +0000
+++ b/lisp/gnus/nnimap.el       2012-02-13 22:18:33 +0000
@@ -201,7 +201,10 @@
        (while (re-search-forward
                "[^]][ (]{\\([0-9]+\\)}\r?\n"
                (save-excursion
-                 (or (re-search-forward "\\* [0-9]+ FETCH" nil t)
+                 ;; Start of the header section.
+                 (or (re-search-forward "] {[0-9]+}\r?\n" nil t)
+                     ;; Start of the next FETCH.
+                     (re-search-forward "\\* [0-9]+ FETCH" nil t)
                      (point-max)))
                t)
          (setq size (string-to-number (match-string 1)))