* elmo-msgdb.el (elmo-msgdb-create-overview-from-buffer): Protect

against non-exsisting charset.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index d42fdd1..05172fc 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-10  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * elmo-msgdb.el (elmo-msgdb-create-overview-from-buffer): Protect
+       against non-exsisting charset.
+
 2002-05-09  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo-util.el (elmo-mime-string): Eliminate needless binding;

diff --git a/elmo/elmo-msgdb.el b/elmo/elmo-msgdb.el
index 3840908..773d000 100644 (file)
--- a/elmo/elmo-msgdb.el
+++ b/elmo/elmo-msgdb.el
@@ -784,10 +784,10 @@ Header region is supposed to be narrowed."
          default-mime-charset
          extra field-body charset)
       (elmo-set-buffer-multibyte default-enable-multibyte-characters)
-      (setq message-id (elmo-msgdb-get-message-id-from-buffer)
-           charset (intern-soft (cdr (assoc "charset"
-                                            (mime-read-Content-Type)))))
-      (if charset (setq default-mime-charset charset))
+      (setq message-id (elmo-msgdb-get-message-id-from-buffer))
+      (and (setq charset (cdr (assoc "charset" (mime-read-Content-Type))))
+          (setq charset (intern-soft charset))
+          (setq default-mime-charset charset))
       (setq references
            (or (elmo-msgdb-get-last-message-id
                 (elmo-field-body "in-reply-to"))