[gnus git] branch master updated: m0-7-297-g54c8699 =1= * nnimap.el (nnimap-transform-headers): Fix Davmail header parsing.

       via  54c8699609d199dd2388f69581f7b7e1e5850c14 (commit)
      from  f265b39061ffe3575e83eecd30ab7832ebb2a709 (commit)


- Log -----------------------------------------------------------------
commit 54c8699609d199dd2388f69581f7b7e1e5850c14
Author: Lars Ingebrigtsen <[email protected]>
Date:   Thu Jan 30 23:29:50 2014 -0800

    * nnimap.el (nnimap-transform-headers): Fix Davmail header parsing.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e2542dc..931eeb5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-31  Lars Ingebrigtsen  <[email protected]>
+
+	* nnimap.el (nnimap-transform-headers): Fix Davmail header parsing.
+
 2014-01-31  Dave Abrahams  <[email protected]>
 
 	* gnus-salt.el (gnus-tree-highlight-article): Don't move point around
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 016a8a2..cbaea91 100644
--- a/lisp/nnimap.el
+++ b/lisp/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 ".")

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog |    4 ++++
 lisp/nnimap.el |    6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project