Mercurial > emacs
comparison src/coding.c @ 83187:4a196c3bd2d8
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-479
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-480
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-481
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-227
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Sat, 07 Aug 2004 15:05:02 +0000 |
| parents | dbcd0af66869 40a0843be50a |
| children | f70dc61a797f |
comparison
equal
deleted
inserted
replaced
| 83186:1adf7aed3649 | 83187:4a196c3bd2d8 |
|---|---|
| 6232 STRING_COPYIN (newstr, from + produced, | 6232 STRING_COPYIN (newstr, from + produced, |
| 6233 SDATA (str) + to_byte, | 6233 SDATA (str) + to_byte, |
| 6234 shrinked_bytes - from); | 6234 shrinked_bytes - from); |
| 6235 free_conversion_buffer (&buf); | 6235 free_conversion_buffer (&buf); |
| 6236 | 6236 |
| 6237 coding->consumed += shrinked_bytes; | |
| 6238 coding->consumed_char += shrinked_bytes; | |
| 6239 coding->produced += shrinked_bytes; | |
| 6240 coding->produced_char += shrinked_bytes; | |
| 6241 | |
| 6237 if (coding->cmp_data && coding->cmp_data->used) | 6242 if (coding->cmp_data && coding->cmp_data->used) |
| 6238 coding_restore_composition (coding, newstr); | 6243 coding_restore_composition (coding, newstr); |
| 6239 coding_free_composition_data (coding); | 6244 coding_free_composition_data (coding); |
| 6240 | 6245 |
| 6241 if (SYMBOLP (coding->post_read_conversion) | 6246 if (SYMBOLP (coding->post_read_conversion) |
