Merge remote branch 'origin/no-gnus'

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4e591fe..61b76a3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,11 @@
 
        * gnus-sum.el (gnus-summary-expire-articles): Ditto.
 
+2012-03-10  David Edmondson  <dme@dme.org>
+
+       * mm-uu.el (mm-uu-forward-extract): Allow for blank lines between the
+       'Forwarded Message' header and the start of the message.
+
 2012-03-04  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
 
        * gnus-msg.el (gnus-msg-mail): Call `message-mail' correctly when Gnus
@@ -70,6 +75,13 @@
 
        * gnus-start.el (gnus-1): Avoid duplicate entries.
 
+2012-02-16  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * mm-decode.el (mm-dissect-singlepart): Guess what the type of
+       application/octet-stream parts really is.
+
+       * gnus-sum.el (gnus-propagate-marks): Remove.
+
 2012-02-15  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * imap.el: Remove.
@@ -81,13 +93,6 @@
        * gnus-start.el (gnus-clean-old-newsrc): Delete `unexist' from pre-Ma
        Gnus 0.3.
 
-2012-02-16  Lars Ingebrigtsen  <larsi@gnus.org>
-
-       * mm-decode.el (mm-dissect-singlepart): Guess what the type of
-       application/octet-stream parts really is.
-
-       * gnus-sum.el (gnus-propagate-marks): Remove.
-
 2012-02-15  Paul Eggert  <eggert@cs.ucla.edu>
 
        * shr.el (shr-rescale-image): Undo previous change; see
@@ -7893,7 +7898,7 @@
        accept.  Reported by Dan Christensen.
        (nnimap-command): Make sure that the error message doesn't error out.
 
-2010-09-20  David Edmondson  <dme@dme.org>  (tiny change)
+2010-09-20  David Edmondson  <dme@dme.org>
 
        * nnimap.el (nnimap-request-set-mark): Don't wait for a response when
        we haven't requested anything.

diff --git a/lisp/mm-uu.el b/lisp/mm-uu.el
index 4f046d6..0cf3730 100644 (file)
--- a/lisp/mm-uu.el
+++ b/lisp/mm-uu.el
@@ -430,7 +430,11 @@ apply the face `mm-uu-extract'."
 
 (defun mm-uu-forward-extract ()
   (mm-make-handle (mm-uu-copy-to-buffer
-                  (progn (goto-char start-point) (forward-line) (point))
+                  (progn
+                    (goto-char start-point)
+                    (forward-line)
+                    (skip-chars-forward "\n")
+                    (point))
                   (progn (goto-char end-point) (forward-line -1) (point)))
                  '("message/rfc822" (charset . gnus-decoded))))