[Fontconfig] fontconfig: Branch 'master'

[Keith Packard]

 fc-match/fc-match.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bdbc26f3d970581a3248c245451f7fbfb1609601
Author: Keith Packard <keithp at keithp.com>
Date:   Sat May 3 20:14:07 2008 -0700

    Make fc-match behave better when style is unknown (bug 15332)

diff --git a/fc-match/fc-match.c b/fc-match/fc-match.c
index c92d277..aadd08a 100644
--- a/fc-match/fc-match.c
+++ b/fc-match/fc-match.c
@@ -202,7 +202,7 @@ main (int argc, char **argv)
 		if (FcPatternGetString (fs->fonts[j], FC_FAMILY, 0, &family) != FcResultMatch)
 		    family = (FcChar8 *) "<unknown family>";
 		if (FcPatternGetString (fs->fonts[j], FC_STYLE, 0, &style) != FcResultMatch)
-		    file = (FcChar8 *) "<unknown style>";
+		    style = (FcChar8 *) "<unknown style>";
 
 		printf ("%s: \"%s\" \"%s\"\n", file, family, style);
 	    }