[AC21.5] Latest mercurial code does not compile...

Stephen J. Turnbull stephen at xemacs.org
Mon Sep 5 11:03:30 EDT 2011


APPROVE COMMIT 21.5

Attached patch fixes the build.

"Obviously correct"; those enum constants have not been defined in
non-Mule builds since before r428.

Thomas Mittelstaedt writes:
 > Aidan,
 > 
 > I suspect, your latest changes cause compile errors. I just did an hg
 > up. Here is the error:

This fixes for me.

diff -r 855b667dea13 src/ChangeLog
--- a/src/ChangeLog	Sun Sep 04 20:37:55 2011 +0100
+++ b/src/ChangeLog	Mon Sep 05 23:58:09 2011 +0900
@@ -1,3 +1,8 @@
+2011-09-05  Stephen J. Turnbull  <stephen at xemacs.org>
+
+	* chartab.c (nsubst_structures_mapper):
+	Don't use MULE-only cases in non-MULE.
+
 2011-09-04  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* alloc.c:
diff -r 855b667dea13 src/chartab.c
--- a/src/chartab.c	Sun Sep 04 20:37:55 2011 +0100
+++ b/src/chartab.c	Mon Sep 05 23:58:09 2011 +0900
@@ -142,6 +142,7 @@
           }
         break;
       }
+#ifdef MULE
     case CHARTAB_RANGE_CHARSET:
       {
         if (EQ (old, range->charset) == test_not_unboundp)
@@ -168,6 +169,7 @@
           }
         break;
       }
+#endif
     case CHARTAB_RANGE_CHAR:
       {
         if (EQ (old, make_char (range->ch)) == test_not_unboundp)



More information about the XEmacs-Beta mailing list