From 396475b7c1ae2e1a5b1d4be68e6b5b0819a7695b Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Tue, 7 Sep 2010 20:08:46 +0900 Subject: coding.c (detect_coding_emacs_mule): Fix checking of multibyte sequence when the source is multibyte. --- src/coding.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/coding.c') diff --git a/src/coding.c b/src/coding.c index aef80f5cc80..d62998f4c8b 100644 --- a/src/coding.c +++ b/src/coding.c @@ -2031,7 +2031,7 @@ detect_coding_emacs_mule (coding, detect_info) } else { - int more_bytes = emacs_mule_bytes[*src_base] - 1; + int more_bytes = emacs_mule_bytes[c] - 1; while (more_bytes > 0) { -- cgit v1.2.3 From a552b35afa83816d3a4bfaa32be91c196a68e41b Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Wed, 8 Sep 2010 11:21:03 +0900 Subject: coding.c (encode_coding_iso_2022): Do not optimize for ASCII if we may use designation or locking-shift. --- src/ChangeLog | 5 +++++ src/coding.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'src/coding.c') diff --git a/src/ChangeLog b/src/ChangeLog index 3dda03c963f..f46e02b9193 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-09-08 Kenichi Handa + + * coding.c (encode_coding_iso_2022): Don't optimize for ASCII if + we may use designation or locking-shift. + 2010-09-07 Kenichi Handa * coding.c (detect_coding_emacs_mule): Fix checking of multibyte diff --git a/src/coding.c b/src/coding.c index d62998f4c8b..92b328091ff 100644 --- a/src/coding.c +++ b/src/coding.c @@ -4528,7 +4528,10 @@ encode_coding_iso_2022 (coding) charset_list = CODING_ATTR_CHARSET_LIST (attrs); coding->safe_charsets = SDATA (CODING_ATTR_SAFE_CHARSETS (attrs)); - ascii_compatible = ! NILP (CODING_ATTR_ASCII_COMPAT (attrs)); + ascii_compatible + = (! NILP (CODING_ATTR_ASCII_COMPAT (attrs)) + && ! (CODING_ISO_FLAGS (coding) & (CODING_ISO_FLAG_DESIGNATION + | CODING_ISO_FLAG_LOCKING_SHIFT))); while (charbuf < charbuf_end) { -- cgit v1.2.3