changeset 4270:bd9b678f4db7

[xemacs-hg @ 2007-11-15 10:05:14 by aidan] Eliminate a non-Mule build failure from my last Unicode change--thank you Vin!
author aidan
date Thu, 15 Nov 2007 10:05:16 +0000
parents 609a5762d915
children fdf43260ae29
files src/ChangeLog src/unicode.c
diffstat 2 files changed, 17 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Wed Nov 14 22:50:59 2007 +0000
+++ b/src/ChangeLog	Thu Nov 15 10:05:16 2007 +0000
@@ -1,3 +1,12 @@
+2007-11-15  Aidan Kehoe  <kehoea@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@parhasard.net>
 
 	* lread.c (read_unicode_escape):
--- a/src/unicode.c	Wed Nov 14 22:50:59 2007 +0000
+++ b/src/unicode.c	Thu Nov 15 10:05:16 2007 +0000
@@ -2862,14 +2862,6 @@
 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 @@
   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;