changeset 35320:aa8df54873a9

(decode-char): Fix conditions. (encode-char): Handle eight-bit-control too.
author Kenichi Handa <handa@m17n.org>
date Tue, 16 Jan 2001 06:50:23 +0000
parents f304afa8667b
children 44f49244c7bd
files lisp/international/mule.el
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/international/mule.el	Tue Jan 16 06:49:46 2001 +0000
+++ b/lisp/international/mule.el	Tue Jan 16 06:50:23 2001 +0000
@@ -304,7 +304,7 @@
 Optional argument RESTRICTION specifies a way to map the pair of CCS
 and CODE-POINT to a chracter.   Currently not supported and just ignored."
   (cond ((eq ccs 'ucs)
-	 (cond ((< code-point 128)
+	 (cond ((< code-point 160)
 		code-point)
 	       ((< code-point 256)
 		(make-char 'latin-iso8859-1 code-point))
@@ -312,7 +312,7 @@
 		(setq code-point (- code-point #x0100))
 		(make-char 'mule-unicode-0100-24ff 
 			   (+ (/ code-point 96) 32) (+ (% code-point 96) 32)))
-	       ((< code-point #x33ff)
+	       ((< code-point #x3400)
 		(setq code-point (- code-point #x2500))
 		(make-char 'mule-unicode-2500-33ff
 			   (+ (/ code-point 96) 32) (+ (% code-point 96) 32)))
@@ -330,7 +330,7 @@
 
 CHAR should be in one of these charsets:
   ascii, latin-iso8859-1, mule-unicode-0100-24ff, mule-unicode-2500-33ff,
-  mule-unicode-e000-ffff
+  mule-unicode-e000-ffff, eight-bit-control
 Otherwise, return nil.
 
 Optional argument RESTRICTION specifies a way to map CHAR to a
@@ -350,7 +350,9 @@
 			       (- (nth 2 split) 32))))
 		 ((eq charset 'mule-unicode-e000-ffff)
 		  (+ #xe000 (+ (* (- (nth 1 split) 32) 96)
-			       (- (nth 2 split) 32)))))))))
+			       (- (nth 2 split) 32))))
+		 ((eq charset 'eight-bit-control)
+		  char))))))
 
 
 ;; Coding system stuff