Merge from trunk.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/coding.c b/src/coding.c
index a2ea9b302cf..be7166e8a14 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -1,5 +1,5 @@
 /* Coding system handler (conversion, detection, etc).
-   Copyright (C) 2001-2011 Free Software Foundation, Inc.
+   Copyright (C) 2001-2012 Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
      2005, 2006, 2007, 2008, 2009, 2010, 2011
      National Institute of Advanced Industrial Science and Technology (AIST)
@@ -10003,8 +10003,6 @@ usage: (define-coding-system-internal ...)  */)
     {
       Lisp_Object bom;
 
-      CODING_ATTR_ASCII_COMPAT (attrs) = Qt;
-
       if (nargs < coding_arg_utf8_max)
         goto short_args;
 
@@ -10018,6 +10016,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