diff options
| author | Karoly Lorentey | 2004-08-07 15:05:02 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-08-07 15:05:02 +0000 |
| commit | 18ad87544445be2584163436bd3c5d6366afa122 (patch) | |
| tree | 5b724841af27d9cf79c42f09e0c1079203b68107 /src/coding.c | |
| parent | d03a8fe4dee75f545e50891247367a167fc980d7 (diff) | |
| parent | de10c1149c818f8cee4cc5af7408655945a339d3 (diff) | |
| download | emacs-18ad87544445be2584163436bd3c5d6366afa122.tar.gz emacs-18ad87544445be2584163436bd3c5d6366afa122.zip | |
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
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/coding.c b/src/coding.c index b36f7fbfbff..1257771d3ed 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -6234,6 +6234,11 @@ decode_coding_string (str, coding, nocopy) | |||
| 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); |