From: Kenichi Handa Date: Wed, 28 Dec 2011 07:55:49 +0000 (+0900) Subject: coding.c: (Fdefine_coding_system_internal): Make an utf-8 base coding-system ASCII... X-Git-Tag: emacs-pretest-24.0.93~106 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0e5317f7e42c1008c40305a94afcdff509a475be;p=emacs.git 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). --- diff --git a/src/ChangeLog b/src/ChangeLog index 2c3644f14fa..f10e2955164 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2011-12-28 Kenichi Handa + + * 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 * 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 e15d725af3a..2db5385c932 100644 --- 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