(mm-charset-to-coding-system): Use user specified

charset unless coding-system-get is fboundp.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 44ee798..ed5c282 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-30  Simon Josefsson  <jas@extundo.com>
+
+       * mm-util.el (mm-charset-to-coding-system): Use user specified
+       charset unless coding-system-get is fboundp.
+
 2003-04-30  Kevin Greiner <kgreiner@xpediantsolutions.com>
 
        * gnus-agent.el (gnus-agent-cat-defaccessor, gnus-agent-cat-name):

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 9f579b3..c50c3b5 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -341,7 +341,8 @@ used as the line break code type of the coding system."
    ((null charset)
     charset)
    ;; Running in a non-MULE environment.
-   ((null (mm-get-coding-system-list))
+   ((or (null (mm-get-coding-system-list))
+       (not (fboundp 'coding-system-get)))
     charset)
    ;; ascii
    ((eq charset 'us-ascii)