2000-11-30 14:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* mm-util.el (mm-find-charset-region): Remove eight-bit-*.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2a1b996..d54fd3a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-30 14:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * mm-util.el (mm-find-charset-region): Remove eight-bit-*.
+
 2000-11-30  Simon Josefsson  <sj@extundo.com>
 
        * smime.el (smime-point-at-eol): New alias.

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index edd8ae7..869a757 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -420,7 +420,11 @@ Mule4 only."
    ((and (mm-multibyte-p)
         (fboundp 'find-charset-region))
     ;; Remove composition since the base charsets have been included.
-    (delq 'composition (find-charset-region b e)))
+    ;; Remove eight-bit-*, treat them as ascii.
+    (let ((css (find-charset-region b e)))
+      (mapcar (lambda (cs) (setq css (delq cs css)))
+             '(composition eight-bit-control eight-bit-graphic))
+      css))
    (t
     ;; We are in a unibyte buffer or XEmacs non-mule, so we futz around a bit.
     (save-excursion