From: Kenichi Handa <handa@m17n.org>
Date: Mon, 7 Sep 1998 13:39:15 +0000 (+0000)
Subject: (ccl_coding_driver): Always calculate correct mulibyte
X-Git-Tag: emacs-20.4~1748
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=69f7652519aa088fab50f747a3eb30644e8f6760;p=emacs.git

(ccl_coding_driver): Always calculate correct mulibyte
chars in produced byte sequence.
(Ffind_operation_coding_system): Doc-string fixed.
---

diff --git a/src/coding.c b/src/coding.c
index 3d702c4b6f5..80c0292e233 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -3612,18 +3612,11 @@ ccl_coding_driver (coding, source, destination, src_bytes, dst_bytes, encodep)
 
   coding->produced = ccl_driver (ccl, source, destination,
 				 src_bytes, dst_bytes, &(coding->consumed));
-  if (encodep)
-    {
-      coding->produced_char = coding->produced;
-      coding->consumed_char
-	= multibyte_chars_in_text (source, coding->consumed);
-    }
-  else
-    {
-      coding->produced_char
-	= multibyte_chars_in_text (destination, coding->produced);
-      coding->consumed_char = coding->consumed;
-    }
+  coding->produced_char
+    = multibyte_chars_in_text (destination, coding->produced);
+  coding->consumed_char
+    = multibyte_chars_in_text (source, coding->consumed);
+
   switch (ccl->status)
     {
     case CCL_STAT_SUSPEND_BY_SRC:
@@ -4988,7 +4981,7 @@ DEFUN ("keyboard-coding-system",
 DEFUN ("find-operation-coding-system", Ffind_operation_coding_system,
        Sfind_operation_coding_system,  1, MANY, 0,
   "Choose a coding system for an operation based on the target name.\n\
-The value names a pair of coding systems: (DECODING-SYSTEM ENCODING-SYSTEM).\n\
+The value names a pair of coding systems: (DECODING-SYSTEM . ENCODING-SYSTEM).\n\
 DECODING-SYSTEM is the coding system to use for decoding\n\
 \(in case OPERATION does decoding), and ENCODING-SYSTEM is the coding system\n\
 for encoding (in case OPERATION does encoding).\n\