Mercurial > hg > xemacs-beta

comparison 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
comparison
equal deleted inserted replaced
4859:262b29aedd54 4860:edc0cd26b4a8
555 Lisp_Object fontlist = Qnil; 555 Lisp_Object fontlist = Qnil;
556 fc_pattern *fcpat; 556 fc_pattern *fcpat;
557 557
558 /* #### improve this error message */ 558 /* #### improve this error message */
559 if (!fontset) 559 if (!fontset)
560 Fsignal (Qinvalid_state, 560 invalid_state ("failed to create FcFontSet", Qunbound);
561 list1 (build_string ("failed to create FcFontSet")));
562 for (idx = 0; idx < fontset->nfont; ++idx) 561 for (idx = 0; idx < fontset->nfont; ++idx)
563 { 562 {
564 fcpat = 563 fcpat =
565 ALLOC_LCRECORD_TYPE (struct fc_pattern, &lrecord_fc_pattern); 564 ALLOC_LCRECORD_TYPE (struct fc_pattern, &lrecord_fc_pattern);
566 fcpat->fcpatPtr = FcPatternDuplicate (fontset->fonts[idx]); 565 fcpat->fcpatPtr = FcPatternDuplicate (fontset->fonts[idx]);
912 { 911 {
913 FcMatchKind knd; 912 FcMatchKind knd;
914 913
915 /* There ought to be a standard idiom for this.... */ 914 /* There ought to be a standard idiom for this.... */
916 if (NILP (kind) 915 if (NILP (kind)
917 || EQ (kind, Qfc_match_font)) { 916 || EQ (kind, Qfc_match_font))
918 knd = FcMatchFont; 917 knd = FcMatchFont;
919 } 918 else if (EQ (kind, Qfc_match_pattern))
920 else if (EQ (kind, Qfc_match_pattern)) {
921 knd = FcMatchPattern; 919 knd = FcMatchPattern;
922 } 920 else
923 else { 921 wtaerror ("need `fc-match-pattern' or `fc-match-font'", kind);
924 Fsignal (Qwrong_type_argument,
925 list2 (build_string ("need `fc-match-pattern' or `fc-match-font'"),
926 kind));
927 }
928 922
929 /* Typecheck arguments */ 923 /* Typecheck arguments */
930 CHECK_FCPATTERN (pattern); 924 CHECK_FCPATTERN (pattern);
931 if (!NILP (testpat)) CHECK_FCPATTERN (testpat); 925 if (!NILP (testpat)) CHECK_FCPATTERN (testpat);
932 if (!NILP (config)) CHECK_FCCONFIG (config); 926 if (!NILP (config)) CHECK_FCCONFIG (config);