diff options
| author | Miles Bader | 2006-02-04 01:01:38 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-02-04 01:01:38 +0000 |
| commit | 307f5c57467e8e967f795d47ec885bf19fd5317f (patch) | |
| tree | 937b5ce4db7094b06d5c1cf58413ca49b860e5db /src/coding.c | |
| parent | 50d4fbde0cd35834e2fc9f0adc4c189657ba7170 (diff) | |
| parent | 6203370b5e51fe55a4132fe8ccc868c35ad8c67f (diff) | |
| download | emacs-307f5c57467e8e967f795d47ec885bf19fd5317f.tar.gz emacs-307f5c57467e8e967f795d47ec885bf19fd5317f.zip | |
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-11
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 34-42)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 14-17)
- Update from CVS
- Merge from emacs--devo--0
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/coding.c b/src/coding.c index 6ec0804353f..f10a10e1e72 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 | 1042 | else if (c >= 0x80) |
| 1043 | { | 1043 | { |
| 1044 | Lisp_Object this_buffer; | 1044 | Lisp_Object this_buffer; |
| 1045 | 1045 | ||
| @@ -1308,6 +1308,8 @@ 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; | ||
| 1311 | 1313 | ||
| 1312 | no_more_source: | 1314 | no_more_source: |
| 1313 | coding->consumed_char += consumed_chars_base; | 1315 | coding->consumed_char += consumed_chars_base; |