Merge branch 'master' of https://git.gnus.org/gnus

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c142025..2d43410 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,7 @@
        (nndoc-git-type-p): New function.
        (nndoc-transform-git-article): Ditto.
        (nndoc-transform-git-headers): Ditto.
+       (nndoc-transform-git-headers): Generate Subject headers.
 
        * shr.el (shr-parse-style): New function.
        (shr-tag-span): Ditto.

diff --git a/lisp/nndoc.el b/lisp/nndoc.el
index 5d946f5..9f147e3 100644 (file)
--- a/lisp/nndoc.el
+++ b/lisp/nndoc.el
@@ -232,19 +232,22 @@ from the document.")
          (while articles
            (when (setq entry (cdr (assq (setq article (pop articles))
                                         nndoc-dissection-alist)))
-             (insert (format "221 %d Article retrieved.\n" article))
-             (if nndoc-generate-head-function
-                 (funcall nndoc-generate-head-function article)
-               (insert-buffer-substring
-                nndoc-current-buffer (car entry) (nth 1 entry)))
-             (goto-char (point-max))
-             (unless (eq (char-after (1- (point))) ?\n)
-               (insert "\n"))
-             (insert (format "Lines: %d\n" (nth 4 entry)))
-             (insert ".\n")))
-
-         (when nndoc-header-transform-function
-           (funcall nndoc-header-transform-function))
+             (let ((start (point)))
+               (insert (format "221 %d Article retrieved.\n" article))
+               (if nndoc-generate-head-function
+                   (funcall nndoc-generate-head-function article)
+                 (insert-buffer-substring
+                  nndoc-current-buffer (car entry) (nth 1 entry)))
+               (goto-char (point-max))
+               (unless (eq (char-after (1- (point))) ?\n)
+                 (insert "\n"))
+               (insert (format "Lines: %d\n" (nth 4 entry)))
+               (insert ".\n")
+               (when nndoc-header-transform-function
+                 (save-excursion
+                   (save-restriction
+                     (narrow-to-region start (point))
+                     (funcall nndoc-header-transform-function entry)))))))
          (nnheader-fold-continuation-lines)
          'headers)))))
 
@@ -671,10 +674,19 @@ from the document.")
   (when (re-search-forward "^Author: " nil t)
     (replace-match "From: " t t)))
 
-(defun nndoc-transform-git-headers ()
+(defun nndoc-transform-git-headers (entry)
   (goto-char (point-min))
-  (while (re-search-forward "^Author: " nil t)
-    (replace-match "From: " t t)))
+  (when (re-search-forward "^Author: " nil t)
+    (replace-match "From: " t t))
+  (let (subject)
+    (with-current-buffer nndoc-current-buffer
+      (goto-char (car entry))
+      (when (search-forward "\n\n" nil t)
+       (setq subject (buffer-substring (point) (line-end-position)))))
+    (when subject
+      (goto-char (point-min))
+      (forward-line 1)
+      (insert (format "Subject: %s\n" subject)))))
 
 (defun nndoc-lanl-gov-announce-type-p ()
   (when (let ((case-fold-search nil))

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 1ce117c..66ae4f4 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -2,6 +2,7 @@
 
        * gnus.texi (Customizing the IMAP Connection): The port strings are
        strings.
+       (Document Groups): Mention git.
 
 2010-10-18  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 266f3e2..acfe0aa 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -17969,6 +17969,10 @@ A @acronym{MIME} digest of messages.
 @item lanl-gov-announce
 Announcement messages from LANL Gov Announce.
 
+@cindex git commit messages
+@item git
+@code{git} commit messages.
+
 @cindex forwarded messages
 @item rfc822-forward
 A message forwarded according to RFC822.