aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2008-12-03 01:22:25 +0000
committerKenichi Handa2008-12-03 01:22:25 +0000
commit453b38f050e3e87b14218df175bdd1d71740fc41 (patch)
tree16c0f4eaab15a81a62cdbaca99d6942e978c2dce /src
parent3a8406e12624232c1d0c36307050c32514713972 (diff)
downloademacs-453b38f050e3e87b14218df175bdd1d71740fc41.tar.gz
emacs-453b38f050e3e87b14218df175bdd1d71740fc41.zip
(decode_coding_utf_8): Likewise.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/coding.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index eab70fa8984..18bae46b1b6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
2 2
3 * coding.c (decode_coding_utf_16): Initialize consumed_chars_base 3 * coding.c (decode_coding_utf_16): Initialize consumed_chars_base
4 to 0. 4 to 0.
5 (decode_coding_utf_8): Likewise.
5 6
62008-12-02 Chong Yidong <cyd@stupidchicken.com> 72008-12-02 Chong Yidong <cyd@stupidchicken.com>
7 8
diff --git a/src/coding.c b/src/coding.c
index 231edf5e345..88678a00767 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -1326,7 +1326,7 @@ decode_coding_utf_8 (coding)
1326 const unsigned char *src_base; 1326 const unsigned char *src_base;
1327 int *charbuf = coding->charbuf + coding->charbuf_used; 1327 int *charbuf = coding->charbuf + coding->charbuf_used;
1328 int *charbuf_end = coding->charbuf + coding->charbuf_size; 1328 int *charbuf_end = coding->charbuf + coding->charbuf_size;
1329 int consumed_chars = 0, consumed_chars_base; 1329 int consumed_chars = 0, consumed_chars_base = 0;
1330 int multibytep = coding->src_multibyte; 1330 int multibytep = coding->src_multibyte;
1331 enum utf_bom_type bom = CODING_UTF_8_BOM (coding); 1331 enum utf_bom_type bom = CODING_UTF_8_BOM (coding);
1332 Lisp_Object attr, charset_list; 1332 Lisp_Object attr, charset_list;