Mercurial > emacs
comparison src/coding.c @ 90291:d6f8fe3307c8
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
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sat, 04 Feb 2006 01:01:38 +0000 |
| parents | 72d8a45f6c9f ae0affba29c8 |
| children | 697c08d95af7 |
comparison
equal
deleted
inserted
replaced
| 90290:6a1672fcf6ae | 90291:d6f8fe3307c8 |
|---|---|
| 1037 | 1037 |
| 1038 GAP_SIZE -= add; ZV += add; Z += add; ZV_BYTE += add; Z_BYTE += add; | 1038 GAP_SIZE -= add; ZV += add; Z += add; ZV_BYTE += add; Z_BYTE += add; |
| 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 |
| 1046 this_buffer = Fcurrent_buffer (); | 1046 this_buffer = Fcurrent_buffer (); |
| 1047 set_buffer_internal (XBUFFER (coding->dst_object)); | 1047 set_buffer_internal (XBUFFER (coding->dst_object)); |
| 1306 consumed_chars = consumed_chars_base; | 1306 consumed_chars = consumed_chars_base; |
| 1307 ONE_MORE_BYTE (c); | 1307 ONE_MORE_BYTE (c); |
| 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; |
| 1314 coding->consumed = src_base - coding->source; | 1316 coding->consumed = src_base - coding->source; |
| 1315 coding->charbuf_used = charbuf - coding->charbuf; | 1317 coding->charbuf_used = charbuf - coding->charbuf; |
