diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2010-09-14 16:41:53 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2010-09-14 16:41:53 +0200 |
| commit | 6664fc59a8f296117ea98b943f062c0cc0e907c1 (patch) | |
| tree | b8e0bf218492291433d00a71122bc8cd2c662ea9 /src/coding.c | |
| parent | 74769e8b4c73f24e8f3356bd281a56a30000c648 (diff) | |
| parent | f3a30a50fab486dcaafb9d897797794fe4c3c4b3 (diff) | |
| download | emacs-6664fc59a8f296117ea98b943f062c0cc0e907c1.tar.gz | |
Merge changes from emacs-23 branch.
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/coding.c b/src/coding.c index 6012978b60a..d6285ed9245 100644 --- a/src/coding.c +++ b/src/coding.c @@ -2008,7 +2008,7 @@ detect_coding_emacs_mule (struct coding_system *coding, } else { - int more_bytes = emacs_mule_bytes[*src_base] - 1; + int more_bytes = emacs_mule_bytes[c] - 1; while (more_bytes > 0) { @@ -4490,7 +4490,10 @@ encode_coding_iso_2022 (struct coding_system *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) { |