Have 'make' output better GEN names

[gnu-emacs] / src / charset.c

diff --git a/src/charset.c b/src/charset.c
index 171a00f23d1116164885dc688a5198cd1a7cdfd1..ea1480e806ad98271220ed67a62b28de8e49c6fc 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -1,6 +1,6 @@
 /* Basic character set support.
 
 /* Basic character set support.
 

-Copyright (C) 2001-2014 Free Software Foundation, Inc.
+Copyright (C) 2001-2015 Free Software Foundation, Inc.

 
 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
   2005, 2006, 2007, 2008, 2009, 2010, 2011
 
 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
   2005, 2006, 2007, 2008, 2009, 2010, 2011


@@ -66,16 +66,7 @@ struct charset *charset_table;
 static ptrdiff_t charset_table_size;
 static int charset_table_used;
 
 static ptrdiff_t charset_table_size;
 static int charset_table_used;
 

-Lisp_Object Qcharsetp;
-
-/* Special charset symbols.  */
-Lisp_Object Qascii;
-static Lisp_Object Qeight_bit;
-static Lisp_Object Qiso_8859_1;
-static Lisp_Object Qunicode;
-static Lisp_Object Qemacs;
-
-/* The corresponding charsets.  */
+/* Special charsets corresponding to symbols.  */

 int charset_ascii;
 int charset_eight_bit;
 static int charset_iso_8859_1;
 int charset_ascii;
 int charset_eight_bit;
 static int charset_iso_8859_1;


@@ -88,9 +79,6 @@ int charset_jisx0208_1978;
 int charset_jisx0208;
 int charset_ksc5601;
 
 int charset_jisx0208;
 int charset_ksc5601;
 

-/* Value of charset attribute `charset-iso-plane'.  */
-static Lisp_Object Qgl, Qgr;
-

 /* Charset of unibyte characters.  */
 int charset_unibyte;
 
 /* Charset of unibyte characters.  */
 int charset_unibyte;
 


@@ -101,10 +89,9 @@ Lisp_Object Vcharset_ordered_list;
    charsets.  */
 Lisp_Object Vcharset_non_preferred_head;
 
    charsets.  */
 Lisp_Object Vcharset_non_preferred_head;
 

-/* Incremented everytime we change Vcharset_ordered_list.  This is
-   unsigned short so that it fits in Lisp_Int and never matches
-   -1.  */
-unsigned short charset_ordered_list_tick;
+/* Incremented every time we change the priority of charsets.
+   Wraps around.  */
+EMACS_UINT charset_ordered_list_tick;

 
 /* List of iso-2022 charsets.  */
 Lisp_Object Viso_2022_charset_list;
 
 /* List of iso-2022 charsets.  */
 Lisp_Object Viso_2022_charset_list;


@@ -2345,12 +2332,14 @@ syms_of_charset (void)
 {
   DEFSYM (Qcharsetp, "charsetp");
 
 {
   DEFSYM (Qcharsetp, "charsetp");
 

+  /* Special charset symbols.  */

   DEFSYM (Qascii, "ascii");
   DEFSYM (Qunicode, "unicode");
   DEFSYM (Qemacs, "emacs");
   DEFSYM (Qeight_bit, "eight-bit");
   DEFSYM (Qiso_8859_1, "iso-8859-1");
 
   DEFSYM (Qascii, "ascii");
   DEFSYM (Qunicode, "unicode");
   DEFSYM (Qemacs, "emacs");
   DEFSYM (Qeight_bit, "eight-bit");
   DEFSYM (Qiso_8859_1, "iso-8859-1");
 

+  /* Value of charset attribute `charset-iso-plane'.  */

   DEFSYM (Qgl, "gl");
   DEFSYM (Qgr, "gr");
 
   DEFSYM (Qgl, "gl");
   DEFSYM (Qgr, "gr");
 


@@ -2363,10 +2352,6 @@ syms_of_charset (void)
   staticpro (&Vemacs_mule_charset_list);
   Vemacs_mule_charset_list = Qnil;
 
   staticpro (&Vemacs_mule_charset_list);
   Vemacs_mule_charset_list = Qnil;
 

-  /* Don't staticpro them here.  It's done in syms_of_fns.  */
-  QCtest = intern_c_string (":test");
-  Qeq = intern_c_string ("eq");
-

   staticpro (&Vcharset_hash_table);
   {
     Lisp_Object args[2];
   staticpro (&Vcharset_hash_table);
   {
     Lisp_Object args[2];