(encode_coding_raw_text): Set coding->produced_char for all branches.

Compute it differently.

diff --git a/src/ChangeLog b/src/ChangeLog
index c45801feb0929136d9d216a00d0c39f74441c225..f75d655a2707fbcbfa08c309fd7cc6b53afb2193 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2008-05-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * coding.c (encode_coding_raw_text): Set coding->produced_char for
+       all branches.  Compute it differently.
+
        * xdisp.c [!HAVE_WINDOW_SYSTEM]: Include font.h for --without-x.
 
 2008-05-27  Juanma Barranquero  <lekktu@gmail.com>

diff --git a/src/coding.c b/src/coding.c
index b4bd4f0c6344b5438e1a5efdd5079b4081d0e163..3f2d31cfc4c98e59f260dabd4c7cb0d2adf9f344 100644 (file)
--- a/src/coding.c
+++ b/src/coding.c
@@ -4818,7 +4818,6 @@ encode_coding_raw_text (coding)
   int *charbuf_end = coding->charbuf + coding->charbuf_used;
   unsigned char *dst = coding->destination + coding->produced;
   unsigned char *dst_end = coding->destination + coding->dst_bytes;
-  int produced_chars = 0;
   int c;
 
   if (multibytep)
@@ -4873,7 +4872,6 @@ encode_coding_raw_text (coding)
                *dst++ = CHAR_TO_BYTE8 (c);
              else
                CHAR_STRING_ADVANCE (c, dst);
-             produced_chars++;
            }
        }
       else
@@ -4881,11 +4879,10 @@ encode_coding_raw_text (coding)
          ASSURE_DESTINATION (charbuf_end - charbuf);
          while (charbuf < charbuf_end && dst < dst_end)
            *dst++ = *charbuf++;
-         produced_chars = dst - (coding->destination + coding->dst_bytes);
        }
     }
   record_conversion_result (coding, CODING_RESULT_SUCCESS);
-  coding->produced_char += produced_chars;
+  coding->produced_char += charbuf - coding->charbuf;
   coding->produced = dst - coding->destination;
   return 0;
 }