diff options
| author | Glenn Morris | 2012-02-08 23:48:22 -0800 |
|---|---|---|
| committer | Glenn Morris | 2012-02-08 23:48:22 -0800 |
| commit | f998bbe793e9ae7a8df071fec7de63879e67ef1a (patch) | |
| tree | 76126da1e524af178f69ee654b8ca5cf9e02d2cb /src/coding.c | |
| parent | 9fcfcdef41b657921eab99ba8c34f91849c13c45 (diff) | |
| parent | 5c1ca13df753e99d5b7e13177d4ed1baeae26f21 (diff) | |
| download | emacs-f998bbe793e9ae7a8df071fec7de63879e67ef1a.tar.gz emacs-f998bbe793e9ae7a8df071fec7de63879e67ef1a.zip | |
Merge from emacs-23; up to 2010-06-29T18:17:31Z!cyd@stupidchicken.com.
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/coding.c b/src/coding.c index 15e8572edb3..eb89563eef4 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -6849,7 +6849,7 @@ produce_chars (struct coding_system *coding, Lisp_Object translation_table, | |||
| 6849 | dst_end = coding->destination + coding->dst_bytes; | 6849 | dst_end = coding->destination + coding->dst_bytes; |
| 6850 | coding_set_source (coding); | 6850 | coding_set_source (coding); |
| 6851 | src = coding->source + offset; | 6851 | src = coding->source + offset; |
| 6852 | src_end = coding->source + coding->src_bytes; | 6852 | src_end = coding->source + coding->consumed; |
| 6853 | if (EQ (coding->src_object, coding->dst_object)) | 6853 | if (EQ (coding->src_object, coding->dst_object)) |
| 6854 | dst_end = (unsigned char *) src; | 6854 | dst_end = (unsigned char *) src; |
| 6855 | } | 6855 | } |
| @@ -6883,7 +6883,7 @@ produce_chars (struct coding_system *coding, Lisp_Object translation_table, | |||
| 6883 | dst_end = coding->destination + coding->dst_bytes; | 6883 | dst_end = coding->destination + coding->dst_bytes; |
| 6884 | coding_set_source (coding); | 6884 | coding_set_source (coding); |
| 6885 | src = coding->source + offset; | 6885 | src = coding->source + offset; |
| 6886 | src_end = coding->source + coding->src_bytes; | 6886 | src_end = coding->source + coding->consumed; |
| 6887 | if (EQ (coding->src_object, coding->dst_object)) | 6887 | if (EQ (coding->src_object, coding->dst_object)) |
| 6888 | dst_end = (unsigned char *) src; | 6888 | dst_end = (unsigned char *) src; |
| 6889 | } | 6889 | } |
| @@ -6904,7 +6904,7 @@ produce_chars (struct coding_system *coding, Lisp_Object translation_table, | |||
| 6904 | dst = alloc_destination (coding, require, dst); | 6904 | dst = alloc_destination (coding, require, dst); |
| 6905 | coding_set_source (coding); | 6905 | coding_set_source (coding); |
| 6906 | src = coding->source + offset; | 6906 | src = coding->source + offset; |
| 6907 | src_end = coding->source + coding->src_bytes; | 6907 | src_end = coding->source + coding->consumed; |
| 6908 | } | 6908 | } |
| 6909 | } | 6909 | } |
| 6910 | produced_chars = coding->consumed_char; | 6910 | produced_chars = coding->consumed_char; |