[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100023: coding.c (encode_coding_iso_2022): Do not optimize for ASCII if we may use designation or locking-shift.

[Kenichi Handa]

------------------------------------------------------------
revno: 100023 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: emacs-23
timestamp: Wed 2010-09-08 11:22:40 +0900
message:
  coding.c (encode_coding_iso_2022): Do not optimize for ASCII if we may use 
designation or locking-shift.
modified:
  src/ChangeLog
  src/coding.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-09-07 11:08:46 +0000
+++ b/src/ChangeLog     2010-09-08 02:21:03 +0000
@@ -1,3 +1,8 @@
+2010-09-08  Kenichi Handa  <address@hidden>
+
+       * coding.c (encode_coding_iso_2022): Don't optimize for ASCII if
+       we may use designation or locking-shift.
+
 2010-09-07  Kenichi Handa  <address@hidden>
 
        * coding.c (detect_coding_emacs_mule): Fix checking of multibyte

=== modified file 'src/coding.c'
--- a/src/coding.c      2010-09-07 11:08:46 +0000
+++ b/src/coding.c      2010-09-08 02:21:03 +0000
@@ -4528,7 +4528,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)
     {