coding.c: (Fdefine_coding_system_internal): Make an utf-8 base coding-system ASCII...

diff --git a/src/ChangeLog b/src/ChangeLog
index 2c3644f14fa002957e3a1e466fd86d164eef137f..f10e2955164dc6892a5e21b9af1869e208b51e26 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-28  Kenichi Handa  <handa@m17n.org>
+
+       * coding.c (Fdefine_coding_system_internal): Make an utf-8 base
+       coding-system ASCII compatible only when it does not produce BOM
+       on encoding (Bug#10383).
+
 2011-12-26  Jan Djärv  <jan.h.d@swipnet.se>
 
        * xmenu.c (x_menu_wait_for_event): Use xg_select for Gtk3 so menus

diff --git a/src/coding.c b/src/coding.c
index e15d725af3a19af0d01d3ec1cfbadbfb7fab6ecd..2db5385c9327ba1aa7758a4597443aab6a87ecb5 100644 (file)
--- a/src/coding.c
+++ b/src/coding.c
@@ -9999,8 +9999,6 @@ usage: (define-coding-system-internal ...)  */)
     {
       Lisp_Object bom;
 
-      CODING_ATTR_ASCII_COMPAT (attrs) = Qt;
-
       if (nargs < coding_arg_utf8_max)
        goto short_args;
 
@@ -10014,6 +10012,8 @@ usage: (define-coding-system-internal ...)  */)
          CHECK_CODING_SYSTEM (val);
        }
       ASET (attrs, coding_attr_utf_bom, bom);
+      if (NILP (bom))
+       CODING_ATTR_ASCII_COMPAT (attrs) = Qt;
 
       category = (CONSP (bom) ? coding_category_utf_8_auto
                  : NILP (bom) ? coding_category_utf_8_nosig