CVS update by aidan xemacs/src ...

[xemacs-cvs at xemacs.org]

  User: aidan   
  Date: 07/11/15 11:05:22

  Modified:    xemacs/src ChangeLog unicode.c
Log:
Eliminate a non-Mule build failure from my last Unicode change--thank you
Vin!

Revision  Changes    Path
1.1107    +9 -0      XEmacs/xemacs/src/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.1106
retrieving revision 1.1107
diff -u -p -r1.1106 -r1.1107
--- ChangeLog	2007/11/14 19:41:08	1.1106
+++ ChangeLog	2007/11/15 10:05:14	1.1107
@@ -1,3 +1,12 @@
+2007-11-15  Aidan Kehoe  <kehoea at parhasard.net>
+
+	* unicode.c (coding_system_type_create_unicode):
+	* unicode.c (vars_of_unicode):
+	Move the initialisation of Vnumber_of_jit_charsets,
+	Vlast_jit_charset_final, Vcharset_descr to an #ifdef MULE block in
+	vars_of_unicode. Fixes a build failure reported by Vin
+	Shelton--thank you Vin!
+
 2007-11-14  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* lread.c (read_unicode_escape):



1.40      +8 -8      XEmacs/xemacs/src/unicode.c

Index: unicode.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/unicode.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- unicode.c	2007/11/14 19:41:09	1.39
+++ unicode.c	2007/11/15 10:05:16	1.40
@@ -2862,14 +2862,6 @@ syms_of_unicode (void)
 void
 coding_system_type_create_unicode (void)
 {
-  staticpro (&Vnumber_of_jit_charsets);
-  Vnumber_of_jit_charsets = make_int (0);
-  staticpro (&Vlast_jit_charset_final);
-  Vlast_jit_charset_final = make_char (0x30);
-  staticpro (&Vcharset_descr);
-  Vcharset_descr
-    = build_string ("Mule charset for otherwise unknown Unicode code points.");
-
   INITIALIZE_CODING_SYSTEM_TYPE_WITH_DATA (unicode, "unicode-coding-system-p");
   CODING_SYSTEM_HAS_METHOD (unicode, print);
   CODING_SYSTEM_HAS_METHOD (unicode, convert);
@@ -2907,6 +2899,14 @@ vars_of_unicode (void)
   Fprovide (intern ("unicode"));
 
 #ifdef MULE
+  staticpro (&Vnumber_of_jit_charsets);
+  Vnumber_of_jit_charsets = make_int (0);
+  staticpro (&Vlast_jit_charset_final);
+  Vlast_jit_charset_final = make_char (0x30);
+  staticpro (&Vcharset_descr);
+  Vcharset_descr
+    = build_string ("Mule charset for otherwise unknown Unicode code points.");
+
   staticpro (&Vlanguage_unicode_precedence_list);
   Vlanguage_unicode_precedence_list = Qnil;