aboutsummaryrefslogtreecommitdiffstats
path: root/src/coding.c
diff options
context:
space:
mode:
authorStefan Monnier2008-05-27 15:49:49 +0000
committerStefan Monnier2008-05-27 15:49:49 +0000
commit01d45367b282debabb3ff7c6386101bba6e4b493 (patch)
tree0338015ca8192046c06d726134418389e0593239 /src/coding.c
parent5dd5d9eb1aa5d061d1c631f678c1628c9a7225bd (diff)
downloademacs-01d45367b282debabb3ff7c6386101bba6e4b493.tar.gz
emacs-01d45367b282debabb3ff7c6386101bba6e4b493.zip
(encode_coding_raw_text): Set coding->produced_char for all branches.
Compute it differently.
Diffstat (limited to 'src/coding.c')
-rw-r--r--src/coding.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/coding.c b/src/coding.c
index b4bd4f0c634..3f2d31cfc4c 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -4818,7 +4818,6 @@ encode_coding_raw_text (coding)
4818 int *charbuf_end = coding->charbuf + coding->charbuf_used; 4818 int *charbuf_end = coding->charbuf + coding->charbuf_used;
4819 unsigned char *dst = coding->destination + coding->produced; 4819 unsigned char *dst = coding->destination + coding->produced;
4820 unsigned char *dst_end = coding->destination + coding->dst_bytes; 4820 unsigned char *dst_end = coding->destination + coding->dst_bytes;
4821 int produced_chars = 0;
4822 int c; 4821 int c;
4823 4822
4824 if (multibytep) 4823 if (multibytep)
@@ -4873,7 +4872,6 @@ encode_coding_raw_text (coding)
4873 *dst++ = CHAR_TO_BYTE8 (c); 4872 *dst++ = CHAR_TO_BYTE8 (c);
4874 else 4873 else
4875 CHAR_STRING_ADVANCE (c, dst); 4874 CHAR_STRING_ADVANCE (c, dst);
4876 produced_chars++;
4877 } 4875 }
4878 } 4876 }
4879 else 4877 else
@@ -4881,11 +4879,10 @@ encode_coding_raw_text (coding)
4881 ASSURE_DESTINATION (charbuf_end - charbuf); 4879 ASSURE_DESTINATION (charbuf_end - charbuf);
4882 while (charbuf < charbuf_end && dst < dst_end) 4880 while (charbuf < charbuf_end && dst < dst_end)
4883 *dst++ = *charbuf++; 4881 *dst++ = *charbuf++;
4884 produced_chars = dst - (coding->destination + coding->dst_bytes);
4885 } 4882 }
4886 } 4883 }
4887 record_conversion_result (coding, CODING_RESULT_SUCCESS); 4884 record_conversion_result (coding, CODING_RESULT_SUCCESS);
4888 coding->produced_char += produced_chars; 4885 coding->produced_char += charbuf - coding->charbuf;
4889 coding->produced = dst - coding->destination; 4886 coding->produced = dst - coding->destination;
4890 return 0; 4887 return 0;
4891} 4888}