* modb-entity.el (elmo-msgdb-create-message-entity-from-buffer):

Does not bind `default-mime-charset'.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 3ba19f9..2a597cf 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,5 +1,8 @@
 2005-11-23  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
+       * modb-entity.el (elmo-msgdb-create-message-entity-from-buffer):
+       Does not bind `default-mime-charset'.
+
        * modb-entity.el (modb-entity-extract-ml-info-from-mailman): New
        function.
        (modb-entity-extract-mailing-list-info-functions): Added it.

diff --git a/elmo/modb-entity.el b/elmo/modb-entity.el
index f2174af..7d159b2 100644 (file)
--- a/elmo/modb-entity.el
+++ b/elmo/modb-entity.el
@@ -723,13 +723,6 @@ If each field is t, function is set as default converter."
        entity content-type charset)
     (save-excursion
       (set-buffer-multibyte default-enable-multibyte-characters)
-      (and (setq content-type (elmo-decoded-field-body
-                              "content-type" 'summary))
-          (setq charset (mime-content-type-parameter
-                         (mime-parse-Content-Type content-type) "charset"))
-          (setq charset (intern-soft charset))
-          (mime-charset-p charset)
-          (setq default-mime-charset charset))
       (setq entity
            (modb-standard-make-message-entity
             handler
@@ -765,7 +758,7 @@ If each field is t, function is set as default converter."
                  (mime-decode-field-body field-body "cc" 'summary))
                (elmo-multiple-field-body "cc") ",")
               :content-type
-              content-type
+              (elmo-decoded-field-body "content-type" 'summary)
               :size
               (let ((size (elmo-field-body "content-length")))
                 (if size