Mercurial > emacs
diff src/coding.c @ 110357:41bf9b6f3b91
Merge changes from emacs-23 branch.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Tue, 14 Sep 2010 16:41:53 +0200 |
| parents | 77fb60d4233b 3ffb3b102dae |
| children | bec49af30c2f |
line wrap: on
line diff
--- a/src/coding.c Tue Sep 14 13:44:44 2010 +0000 +++ b/src/coding.c Tue Sep 14 16:41:53 2010 +0200 @@ -2008,7 +2008,7 @@ } 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 @@ 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) {