diff options
| author | Eli Zaretskii | 2010-01-22 15:40:56 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2010-01-22 15:40:56 -0500 |
| commit | cf206f28eb11467aed7f5e03f3e4df7724fd98d2 (patch) | |
| tree | 2f5695e6a774a918874b82c286f140abd052d860 /src/coding.c | |
| parent | 5a876cd5f810b611f78dd4cf7a1673bffeea19a9 (diff) | |
| parent | c893016b07f33eb8d56e1011245fe59a67cb4ee0 (diff) | |
| download | emacs-cf206f28eb11467aed7f5e03f3e4df7724fd98d2.tar.gz emacs-cf206f28eb11467aed7f5e03f3e4df7724fd98d2.zip | |
Merge from mainline.
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/coding.c b/src/coding.c index b3a51eb0c4c..935d32e6a58 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -7417,7 +7417,8 @@ consume_chars (coding, translation_table, max_lookup) | |||
| 7417 | { | 7417 | { |
| 7418 | EMACS_INT bytes; | 7418 | EMACS_INT bytes; |
| 7419 | 7419 | ||
| 7420 | if (coding->encoder == encode_coding_raw_text) | 7420 | if (coding->encoder == encode_coding_raw_text |
| 7421 | || coding->encoder == encode_coding_ccl) | ||
| 7421 | c = *src++, pos++; | 7422 | c = *src++, pos++; |
| 7422 | else if ((bytes = MULTIBYTE_LENGTH (src, src_end)) > 0) | 7423 | else if ((bytes = MULTIBYTE_LENGTH (src, src_end)) > 0) |
| 7423 | c = STRING_CHAR_ADVANCE_NO_UNIFY (src), pos += bytes; | 7424 | c = STRING_CHAR_ADVANCE_NO_UNIFY (src), pos += bytes; |