--- a/src/ChangeLog	Thu Jan 14 02:42:58 2010 -0600
+++ b/src/ChangeLog	Thu Jan 14 06:00:09 2010 -0600
@@ -1,3 +1,15 @@
+2010-01-14  Ben Wing  <ben@xemacs.org>
+
+	* buffer.h:
+	* compiler.h:
+	Don't use USED_IF_MULE_OR_CHECK_TEXT in buffer.h.  Eliminate since
+	not used anywhere any more.
+	
+	* font-mgr.c (fontset_to_list):
+	* font-mgr.c (Ffc_config_substitute):
+	Don't use Fsignal() as it may return.  Use signal_error() instead
+	or a more specific function such as invalid_state() or wtaerror().
+
 2010-01-14  Ben Wing  <ben@xemacs.org>
 
 	* syswindows.h: Don't define CYGWIN_HEADERS here.

--- a/src/buffer.h	Thu Jan 14 02:42:58 2010 -0600
+++ b/src/buffer.h	Thu Jan 14 06:00:09 2010 -0600
@@ -543,7 +543,7 @@
 
 DECLARE_INLINE_HEADER (
 Bytebpos
-prev_bytebpos (struct buffer *USED_IF_MULE_OR_CHECK_TEXT (buf), Bytebpos x)
+prev_bytebpos (struct buffer *buf, Bytebpos x)
 )
 {
   DEC_BYTEBPOS (buf, x);
@@ -552,7 +552,7 @@
 
 DECLARE_INLINE_HEADER (
 Bytebpos
-next_bytebpos (struct buffer *USED_IF_MULE_OR_CHECK_TEXT (buf), Bytebpos x)
+next_bytebpos (struct buffer *buf, Bytebpos x)
 )
 {
   INC_BYTEBPOS (buf, x);
@@ -587,8 +587,7 @@
 
 DECLARE_INLINE_HEADER (
 Bytebpos
-charbpos_to_bytebpos (struct buffer *USED_IF_MULE_OR_CHECK_TEXT (buf),
-		      Charbpos x)
+charbpos_to_bytebpos (struct buffer *buf, Charbpos x)
 )
 {
   Bytebpos retval;
@@ -620,8 +619,7 @@
 
 DECLARE_INLINE_HEADER (
 Charbpos
-bytebpos_to_charbpos (struct buffer *USED_IF_MULE_OR_CHECK_TEXT (buf),
-		      Bytebpos x)
+bytebpos_to_charbpos (struct buffer *buf, Bytebpos x)
 )
 {
   Charbpos retval;

--- a/src/compiler.h	Thu Jan 14 02:42:58 2010 -0600
+++ b/src/compiler.h	Thu Jan 14 06:00:09 2010 -0600
@@ -238,11 +238,6 @@
 # else
 #  define USED_IF_MULE(decl) UNUSED (decl)
 # endif
-# if defined (MULE) || defined (ERROR_CHECK_TEXT)
-#  define USED_IF_MULE_OR_CHECK_TEXT(decl) decl
-# else
-#  define USED_IF_MULE_OR_CHECK_TEXT(decl) UNUSED (decl)
-# endif
 # ifdef USE_XFT
 #  define USED_IF_XFT(decl) decl
 # else

--- a/src/font-mgr.c	Thu Jan 14 02:42:58 2010 -0600
+++ b/src/font-mgr.c	Thu Jan 14 06:00:09 2010 -0600
@@ -557,8 +557,7 @@
 
   /* #### improve this error message */
   if (!fontset)
-    Fsignal (Qinvalid_state,
-	     list1 (build_string ("failed to create FcFontSet")));
+    invalid_state ("failed to create FcFontSet", Qunbound);
   for (idx = 0; idx < fontset->nfont; ++idx)
     {
       fcpat = 
@@ -914,17 +913,12 @@
 
   /* There ought to be a standard idiom for this.... */
   if (NILP (kind)
-      || EQ (kind, Qfc_match_font)) {
+      || EQ (kind, Qfc_match_font))
     knd = FcMatchFont;
-  }
-  else if (EQ (kind, Qfc_match_pattern)) {
+  else if (EQ (kind, Qfc_match_pattern))
     knd = FcMatchPattern;
-  }
-  else {
-    Fsignal (Qwrong_type_argument,
-	     list2 (build_string ("need `fc-match-pattern' or `fc-match-font'"),
-		    kind));
-  }
+  else
+    wtaerror ("need `fc-match-pattern' or `fc-match-font'", kind);
 
   /* Typecheck arguments */
   CHECK_FCPATTERN (pattern);