From: Kenichi Handa <handa@m17n.org>
Date: Fri, 13 Dec 2002 04:30:32 +0000 (+0000)
Subject: (ccl-encode-koi8, ccl-encode-alternativnyj): Fix last change.
X-Git-Tag: emacs-pretest-21.2.94~24
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a812117e22fd1bfe590ed357300e44fdd0498184;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5d2407e979a..2be8587e159 100644
--- 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,Bm(Bk  <Pavel@Janik.cz>
 
 	* progmodes/antlr-mode.el (antlr): New URL.
diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index f476075cb25..24e22f7a334 100644
--- 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.")