[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 src/fcmatch.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit aad4d6f6c68d06415333f5d0d3e4b4870114f11d
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Mar 7 13:19:50 2013 +0900

    Do not copy FC_*LANG_OBJECT even if it's not available on the pattern
    
    those objects are linked to the corresponding string objects.
    this may causes inconsistency that those objects has more values than them.

diff --git a/src/fcmatch.c b/src/fcmatch.c
index 23f985a..7993b81 100644
--- a/src/fcmatch.c
+++ b/src/fcmatch.c
@@ -532,7 +532,10 @@ FcFontRenderPrepare (FcConfig	    *config,
     {
 	pe = &FcPatternElts(pat)[i];
 	fe = FcPatternObjectFindElt (font, pe->object);
-	if (!fe)
+	if (!fe &&
+	    pe->object != FC_FAMILYLANG_OBJECT &&
+	    pe->object != FC_STYLELANG_OBJECT &&
+	    pe->object != FC_FULLNAMELANG_OBJECT)
 	{
 	    FcPatternObjectListAdd (new, pe->object,
 				    FcValueListDuplicate (FcPatternEltValues(pe)),