[Emacs-diffs] trunk r116220: lisp/gnus/nnimap.el (nnimap-transform-headers): Fix Davmail header parsing

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 116220
revision-id: address@hidden
parent: address@hidden
author: Lars Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Fri 2014-01-31 08:33:13 +0000
message:
  lisp/gnus/nnimap.el (nnimap-transform-headers): Fix Davmail header parsing
modified:
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/nnimap.el            nnimap.el-20091113204419-o5vbwnq5f7feedwu-1978

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2014-01-31 01:56:00 +0000
+++ b/lisp/gnus/ChangeLog       2014-01-31 08:33:13 +0000
@@ -1,3 +1,7 @@
+2014-01-31  Lars Ingebrigtsen  <address@hidden>
+
+       * nnimap.el (nnimap-transform-headers): Fix Davmail header parsing.
+
 2014-01-31  Dave Abrahams  <address@hidden>
 
        * gnus-salt.el (gnus-tree-highlight-article): Don't move point around

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2014-01-01 07:43:34 +0000
+++ b/lisp/gnus/nnimap.el       2014-01-31 08:33:13 +0000
@@ -216,7 +216,7 @@
                  ;; 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 @@
          (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 ".")