Changes committed gnus/lisp (ChangeLog mml.el)

Modified: ChangeLog mml.el

(mml-insert-mime): Don't break parts that mm-uu dissected.


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1990 gnus/lisp/ChangeLog:7.1991
--- ChangeLog:7.1990	Fri Feb 27 03:32:28 2009
+++ ChangeLog	Tue Mar  3 00:27:36 2009
@@ -1,3 +1,7 @@
+2009-03-02  Katsumi Yamaoka  <[email protected]>
+
+	* mml.el (mml-insert-mime): Don't break parts that mm-uu dissected.
+
 2009-02-27  Katsumi Yamaoka  <[email protected]>
 
 	* lpath.el: Fbind rmail-swap-buffers-maybe for Emacs 21~22;
Index: mml.el
diff -u gnus/lisp/mml.el:7.74 gnus/lisp/mml.el:7.75
--- mml.el:7.74	Thu Jan 22 08:02:16 2009
+++ mml.el	Tue Mar  3 00:27:36 2009
@@ -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