(ccl-encode-koi8, ccl-encode-alternativnyj): Fix last change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5d2407e979ae7252ef74990dbf1ed4e04ca78473..2be8587e159181476f80ed72dbae925ab4a9b4d6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2002-12-13  Kenichi Handa  <handa@m17n.org>
+
+       * language/european.el (encode-mac-roman): Fix last change.
+
+       * language/cyrillic.el (ccl-encode-koi8)
+       (ccl-encode-alternativnyj): Fix last change.
+
 2002-12-04  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
 
        * progmodes/antlr-mode.el (antlr): New URL.

diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index f476075cb25ae4c586a890213dfe5f06fb9fd32c..24e22f7a3341c46522a5e9f9b0cdd9e42f989869 100644 (file)
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -102,9 +102,10 @@
       (read-multibyte-character r0 r1)
       (if (r0 == ,(charset-id 'cyrillic-iso8859-5))
          (translate-character cyrillic-koi8-r-encode-table r0 r1))
-      (if (r0 != ,(charset-id 'eight-bit-graphic))
-         (if (r0 != ,(charset-id 'eight-bit-control))
-             (r1 = ??)))
+      (if (r0 != ,(charset-id 'ascii))
+         (if (r0 != ,(charset-id 'eight-bit-graphic))
+             (if (r0 != ,(charset-id 'eight-bit-control))
+                 (r1 = ??))))
       (write-repeat r1))))
   "CCL program to encode KOI8.")
             
@@ -200,9 +201,10 @@
     ((loop
       (read-multibyte-character r0 r1)
       (translate-character cyrillic-alternativnyj-encode-table r0 r1)
-      (if (r0 != ,(charset-id 'eight-bit-graphic))
-         (if (r0 != ,(charset-id 'eight-bit-control))
-             (r1 = ??)))
+      (if (r0 != ,(charset-id 'ascii))
+         (if (r0 != ,(charset-id 'eight-bit-graphic))
+             (if (r0 != ,(charset-id 'eight-bit-control))
+                 (r1 = ??))))
       (write-repeat r1))))
   "CCL program to encode Alternativnyj.")