diff options
| author | Kenichi Handa <[email protected]> | 2001-02-08 23:29:44 +0000 |
|---|---|---|
| committer | Kenichi Handa <[email protected]> | 2001-02-08 23:29:44 +0000 |
| commit | d280ccb69e196576b092883a3af010ba248243f6 (patch) | |
| tree | f543e1861347a7d0f795e49acf401187be4926ec /src | |
| parent | 19c92c942631226b74a3ff9d2a3516022a90195f (diff) | |
(code_convert_region): After detecting a coding, if
nothing found, set coding->composing to COMPOSITION_NO.
(decode_coding_string): Likewise.
Diffstat (limited to 'src')
| -rw-r--r-- | src/coding.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/coding.c b/src/coding.c index 250977eb5f..d344527b1d 100644 --- a/src/coding.c +++ b/src/coding.c @@ -5356,6 +5356,10 @@ code_convert_region (from, from_byte, to, to_byte, coding, encodep, replace) encodings again in vain. */ coding->type = coding_type_emacs_mule; coding->category_idx = CODING_CATEGORY_IDX_EMACS_MULE; + /* As emacs-mule decoder will handle composition, we + need this setting to allocate coding->cmp_data + later. */ + coding->composing = COMPOSITION_NO; } } if (coding->eol_type == CODING_EOL_UNDECIDED @@ -5808,7 +5812,14 @@ decode_coding_string (str, coding, nocopy) { detect_coding (coding, XSTRING (str)->data, to_byte); if (coding->type == coding_type_undecided) - coding->type = coding_type_emacs_mule; + { + coding->type = coding_type_emacs_mule; + coding->category_idx = CODING_CATEGORY_IDX_EMACS_MULE; + /* As emacs-mule decoder will handle composition, we + need this setting to allocate coding->cmp_data + later. */ + coding->composing = COMPOSITION_NO; + } } if (coding->eol_type == CODING_EOL_UNDECIDED && coding->type != coding_type_ccl) |