aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2006-02-05 02:45:48 +0000
committerKenichi Handa2006-02-05 02:45:48 +0000
commit730fff51c69fc227ee75d73fcc2ffb0507638804 (patch)
treec9ab29b4915e5021f633149dd849d907bb4edec7 /src
parent307f5c57467e8e967f795d47ec885bf19fd5317f (diff)
downloademacs-730fff51c69fc227ee75d73fcc2ffb0507638804.tar.gz
emacs-730fff51c69fc227ee75d73fcc2ffb0507638804.zip
Cancel incorrect synching with HEAD.
Diffstat (limited to 'src')
-rw-r--r--src/coding.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/coding.c b/src/coding.c
index f10a10e1e72..6ec0804353f 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -1039,7 +1039,7 @@ coding_alloc_by_making_gap (coding, bytes)
1039 make_gap (bytes); 1039 make_gap (bytes);
1040 GAP_SIZE += add; ZV -= add; Z -= add; ZV_BYTE -= add; Z_BYTE -= add; 1040 GAP_SIZE += add; ZV -= add; Z -= add; ZV_BYTE -= add; Z_BYTE -= add;
1041 } 1041 }
1042 else if (c >= 0x80) 1042 else
1043 { 1043 {
1044 Lisp_Object this_buffer; 1044 Lisp_Object this_buffer;
1045 1045
@@ -1308,8 +1308,6 @@ decode_coding_utf_8 (coding)
1308 *charbuf++ = ASCII_BYTE_P (c) ? c : BYTE8_TO_CHAR (c); 1308 *charbuf++ = ASCII_BYTE_P (c) ? c : BYTE8_TO_CHAR (c);
1309 coding->errors++; 1309 coding->errors++;
1310 } 1310 }
1311 else
1312 return 0;
1313 1311
1314 no_more_source: 1312 no_more_source:
1315 coding->consumed_char += consumed_chars_base; 1313 coding->consumed_char += consumed_chars_base;