Mercurial > hg > xemacs-beta

diff src/font-mgr.c @ 4860:edc0cd26b4a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix more build problems -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 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().
author Ben Wing <ben@xemacs.org>
date Thu, 14 Jan 2010 06:00:09 -0600
parents 5eacb04a2e62
children 8b63e21b0436
line wrap: on
line diff
--- 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);