2009-05-26 Vitaly Mayatskikh <v.mayatskih@gmail.com>

	* elmo-mime.el (elmo-mime-entity-display): Fix Emacs crash in
	mime-view when displaying malformed base64 attach.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 132dd45..9eda801 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -2,6 +2,9 @@
 
        * elmo-util.el (elmo-union): New function, make a union of two lists.
 
+        * elmo-mime.el (elmo-mime-entity-display): Fix Emacs crash in
+       mime-view when displaying malformed base64 attach.
+
 2009-05-26  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * elmo-version.el (elmo-version): Up to 2.15.7.

diff --git a/elmo/elmo-mime.el b/elmo/elmo-mime.el
index 5ccc1d2..c9c1028 100644 (file)
--- a/elmo/elmo-mime.el
+++ b/elmo/elmo-mime.el
@@ -80,7 +80,8 @@ use for keymap of representation buffer.")
                                              &optional
                                              original-major-mode
                                              keymap)
-  (let ((elmo-message-displaying t))
+  (let ((elmo-message-displaying t)
+       (default-mime-charset 'x-unknown))
     (mime-display-message entity
                          preview-buffer
                          nil