diff options
| author | Mark A. Hershberger | 2010-01-24 23:52:26 -0500 |
|---|---|---|
| committer | Mark A. Hershberger | 2010-01-24 23:52:26 -0500 |
| commit | b1bb0a2570b8a40017220097c40c6057cfe17efe (patch) | |
| tree | d308182f02f1d459ea9a21c31a8ca8b0f3b4f787 /src/coding.c | |
| parent | aaef4f91fad60716fa070b912d71b9f1ccd2e7b4 (diff) | |
| parent | 8dc1adf681df162bfd305debef0e1ab31bed3ebd (diff) | |
| download | emacs-b1bb0a2570b8a40017220097c40c6057cfe17efe.tar.gz emacs-b1bb0a2570b8a40017220097c40c6057cfe17efe.zip | |
merge conflict
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; |