lisp/gnus/nnimap.el (nnimap-transform-headers): Fix Davmail header parsing

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index b30afa601e6fc5ab46efe25bc292f9a183d856f0..29d47ab4226a8785845fe4655500ea918c7859e6 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-31  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * nnimap.el (nnimap-transform-headers): Fix Davmail header parsing.
+
 2014-01-31  Dave Abrahams  <dave@boostpro.com>
 
        * gnus-salt.el (gnus-tree-highlight-article): Don't move point around

diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 016a8a26062b30387822322e6da539d503d916a2..cbaea91f5ab681b77e3915f7bb000aba8bd24063 100644 (file)
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -216,7 +216,7 @@ textual parts.")
                  ;; 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)
+                     (re-search-forward "\\* [0-9]+ \\(UID \\)? FETCH" nil t)
                      (point-max)))
                t)
          (setq size (string-to-number (match-string 1)))
@@ -255,7 +255,9 @@ textual parts.")
          (insert (format "Chars: %s\n" size)))
        (when lines
          (insert (format "Lines: %s\n" lines)))
-       (unless (re-search-forward "^\r$" nil t)
+       ;; Most servers have a blank line after the headers, but
+       ;; Davmail doesn't.
+       (unless (re-search-forward "^\r$\\|^)\r?$" nil t)
          (goto-char (point-max)))
        (delete-region (line-beginning-position) (line-end-position))
        (insert ".")