Add binding property to edit element

[fontconfig.git] / src / fccfg.c

diff --git a/src/fccfg.c b/src/fccfg.c
index 4d5151973f95fbed984d64473775536b0729dddc..478f5a6f7e78072936d792a18181714144bf688f 100644 (file)
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -903,7 +903,7 @@ FcConfigMatchValueList (FcPattern   *p,
 }
 
 static FcValueList *
-FcConfigValues (FcPattern *p, FcExpr *e)
+FcConfigValues (FcPattern *p, FcExpr *e, FcValueBinding binding)
 {
     FcValueList        *l;
     
@@ -916,14 +916,14 @@ FcConfigValues (FcPattern *p, FcExpr *e)
     if (e->op == FcOpComma)
     {
        l->value = FcConfigEvaluate (p, e->u.tree.left);
-       l->next  = FcConfigValues (p, e->u.tree.right);
+       l->next  = FcConfigValues (p, e->u.tree.right, binding);
     }
     else
     {
        l->value = FcConfigEvaluate (p, e);
        l->next  = 0;
     }
-    l->binding = FcValueBindingWeak;
+    l->binding = binding;
     while (l && l->value.type == FcTypeVoid)
     {
        FcValueList     *next = l->next;
@@ -1146,7 +1146,7 @@ FcConfigSubstitute (FcConfig      *config,
            /*
             * Evaluate the list of expressions
             */
-           l = FcConfigValues (p, e->expr);
+           l = FcConfigValues (p, e->expr, e->binding);
            /*
             * Locate any test associated with this field
             */