2001-07-09 17:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* mm-view.el (mm-inline-text): w3-coding-system-for-mime-charset
	may not defined. From: Raja R Harinath <harinath@cs.umn.edu>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a60b621..04ffe27 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2001-07-09 17:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
+       * mm-view.el (mm-inline-text): w3-coding-system-for-mime-charset
+       may not defined. From: Raja R Harinath <harinath@cs.umn.edu>.
+
        * message.el (message-send-mail-real-function): New variable.
        (message-send-mail-partially, message-send-mail): 
 

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 4a92e80..2adeb8f 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -104,11 +104,14 @@
                    (and (boundp 'w3-meta-charset-content-type-regexp)
                         (re-search-forward
                          w3-meta-charset-content-type-regexp nil t)))
-               (setq charset (or (w3-coding-system-for-mime-charset
-                                  (buffer-substring-no-properties
-                                   (match-beginning 2)
-                                   (match-end 2)))
-                                 charset)))
+                (setq charset
+                     (or (let ((bsubstr (buffer-substring-no-properties
+                                         (match-beginning 2)
+                                         (match-end 2))))
+                           (if (fboundp 'w3-coding-system-for-mime-charset)
+                               (w3-coding-system-for-mime-charset bsubstr)
+                             (mm-charset-to-coding-system bsubstr)))
+                         charset)))
            (delete-region (point-min) (point-max))
            (insert (mm-decode-string text charset))
            (save-window-excursion