X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmm-util.el;h=dfad2a2ad7a502c14f83cfa56d9b0dcf777cb6f9;hb=cddb4672a1b8d0b3fb03dd1c5cad4b01f9fab219;hp=1634ce3abb71baee7c25e32eff4fac6e71547331;hpb=7ebf974f6bac5c2f61e7c7cda2962fa4d8766b81;p=elisp%2Fgnus.git-

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 1634ce3..dfad2a2 100644
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -126,7 +126,6 @@
 (defvar mm-charset-synonym-alist
   '((big5 . cn-big5)
     (gb2312 . cn-gb-2312)
-    (iso-2022-jp-2 . iso-2022-7bit-ss2)
     (x-ctext . ctext))
   "A mapping from invalid charset names to the real charset names.")
 
@@ -252,7 +251,9 @@ See also `with-temp-file' and `with-output-to-string'."
 (defun mm-find-charset-region (b e)
   "Return a list of charsets in the region."
   (cond
-   ((fboundp 'find-charset-region)
+   ((and (boundp 'enable-multibyte-characters)
+ 	 enable-multibyte-characters
+ 	 (fboundp 'find-charset-region))
     (find-charset-region b e))
    ((not (boundp 'current-language-environment))
     (save-excursion