mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-18 11:50:38 -08:00
Code Issues Projects Releases Wiki Activity

Merge from trunk.

Browse source
This commit is contained in:
Paul Eggert 2012-01-09 09:36:10 -08:00
commit 35cf62d95c
2137 changed files with 23907 additions and 10975 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/coding.c
View file

@ -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