Merge flim-1_11_0.

[elisp/flim.git] / mmcooked.el

diff --git a/mmcooked.el b/mmcooked.el
index cd261f4..6995469 100644 (file)
--- a/mmcooked.el
+++ b/mmcooked.el
@@ -58,14 +58,27 @@
                  filename)
     ))
 
-(mm-define-method insert-decoded-header ((entity cooked)
-                                        &optional invisible-fields
-                                        visible-fields)
+(mm-define-method insert-header ((entity cooked)
+                                &optional invisible-fields visible-fields)
   (let (default-mime-charset)
     (funcall (mime-find-function 'insert-decoded-header 'buffer)
             entity invisible-fields visible-fields)
     ))
 
+(mm-define-method insert-text-content ((entity cooked))
+  (let ((str (mime-entity-content entity)))
+    (insert
+     (if (member (mime-entity-encoding entity)
+                '(nil "7bit" "8bit" "binary"))
+        str
+       (decode-mime-charset-string str
+                                  (or (mime-content-type-parameter
+                                       (mime-entity-content-type entity)
+                                       "charset")
+                                      default-mime-charset)
+                                  'CRLF)
+       ))))
+
 
 ;;; @ end
 ;;;