# HG changeset patch
# User Jerry James <james@xemacs.org>
# Date 1262901024 25200
# Node ID 0d3ccd5a2509c703480cf12cff6dc752111fce10
# Parent  53071486ff7a90702b43f6315aec3ee61d218ee0
Initialize the result variable passed to FcFontMatch.  See xemacs-patches
message <870180fe1001071349i63d185bfu4906c5a4399407cd@mail.gmail.com>.

diff -r 53071486ff7a -r 0d3ccd5a2509 src/ChangeLog
--- a/src/ChangeLog	Thu Jan 07 12:44:25 2010 -0700
+++ b/src/ChangeLog	Thu Jan 07 14:50:24 2010 -0700
@@ -1,3 +1,9 @@
+2010-01-07  Jerry James  <james@xemacs.org>
+
+	* font-mgr.c (Ffc_font_match): Initialize result to FcResultMatch
+	before calling FcFontMatch.
+	* objects-xlike-inc.c (xft_find_charset_font): Ditto.
+
 2010-01-07  Henrique Martins  <xemacs@martins.cc>
 
 	* dired.c (file_name_completion): If a file is too big to stat(),
diff -r 53071486ff7a -r 0d3ccd5a2509 src/font-mgr.c
--- a/src/font-mgr.c	Thu Jan 07 12:44:25 2010 -0700
+++ b/src/font-mgr.c	Thu Jan 07 14:50:24 2010 -0700
@@ -1004,6 +1004,7 @@
 
   FcConfigSubstitute (fcc, p, FcMatchPattern);
   FcDefaultSubstitute (p);
+  res = FcResultMatch;
   res_fcpat->fcpatPtr = FcFontMatch (fcc, p, &res);
 
   if (res_fcpat->fcpatPtr == NULL)
diff -r 53071486ff7a -r 0d3ccd5a2509 src/objects-xlike-inc.c
--- a/src/objects-xlike-inc.c	Thu Jan 07 12:44:25 2010 -0700
+++ b/src/objects-xlike-inc.c	Thu Jan 07 14:50:24 2010 -0700
@@ -445,6 +445,7 @@
 	FcDefaultSubstitute (p);
 	PRINT_XFT_PATTERN (3, "FcDefaultSubstitute'ed name is %s\n", p);
 	/* #### check fcresult of following match? */
+	fcresult = FcResultMatch;
 	fontxft = FcFontMatch (fcc, p, &fcresult);
 	switch (fcresult)
 	  {