# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1236047543 0
# Node ID 93b10d2621d38f2f4089d703816e724b845d669b
# Parent  21c800bf2b35813085f1551c48eeb505cc0a0d45
Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1561

diff -r 21c800bf2b35 -r 93b10d2621d3 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Tue Mar 03 01:58:22 2009 +0000
+++ b/lisp/gnus/ChangeLog	Tue Mar 03 02:32:23 2009 +0000
@@ -1,3 +1,7 @@
+2009-03-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mml.el (mml-insert-mime): Don't break parts that mm-uu dissected.
+
 2009-02-25  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-dired.el: Remove autoload for gnus-setup-message.
diff -r 21c800bf2b35 -r 93b10d2621d3 lisp/gnus/mml.el
--- a/lisp/gnus/mml.el	Tue Mar 03 01:58:22 2009 +0000
+++ b/lisp/gnus/mml.el	Tue Mar 03 02:32:23 2009 +0000
@@ -898,10 +898,17 @@
       (unless (setq textp (equal (mm-handle-media-supertype handle) "text"))
 	(save-excursion
 	  (set-buffer (setq buffer (mml-generate-new-buffer " *mml*")))
-	  (mm-insert-part handle 'no-cache)
-	  (if (setq mmlp (equal (mm-handle-media-type handle)
-				"message/rfc822"))
-	      (mime-to-mml)))))
+	  (if (eq (mail-content-type-get (mm-handle-type handle) 'charset)
+		  'gnus-decoded)
+	      ;; A part that mm-uu dissected from a non-MIME message
+	      ;; because of `gnus-article-emulate-mime'.
+	      (progn
+		(mm-enable-multibyte)
+		(insert-buffer-substring (mm-handle-buffer handle)))
+	    (mm-insert-part handle 'no-cache)
+	    (if (setq mmlp (equal (mm-handle-media-type handle)
+				  "message/rfc822"))
+		(mime-to-mml))))))
     (if mmlp
 	(mml-insert-mml-markup handle nil t t)
       (unless (and no-markup