From: Patrick Lam <plam@MIT.EDU>
Date: Sat, 26 Nov 2005 05:05:14 +0000 (+0000)
Subject: Fix incorrect merge.
X-Git-Tag: fc-2_3_93~22
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=200a44fed0c28bcf83a65e32c320471d9335d3c5;p=fontconfig.git

Fix incorrect merge.
reviewed by: plam
---

diff --git a/ChangeLog b/ChangeLog
index fd4c375..9a4cf76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-26  Dirk Mueller  <dmueller@suse.com>
+	reviewed by: plam
+	
+	* src/fcmatch.c (FcCompareValueList):
+
+	Fix incorrect merge.
+
 2005-11-25  Patrick Lam  <plam@mit.edu>
 	* src/fcmatch.c (FcMatchObjectPtrsInit, FcCompareValueList):
 
diff --git a/src/fcmatch.c b/src/fcmatch.c
index 26c4124..74829a7 100644
--- a/src/fcmatch.c
+++ b/src/fcmatch.c
@@ -351,10 +351,10 @@ FcCompareValueList (FcObjectPtr o,
     bestWeak = 1e99;
     j = 0;
     for (v1 = v1orig, v1_ptrU = FcValueListPtrU(v1); v1_ptrU;
-	 v1 = FcValueListPtrU(v1)->next, v1_ptrU = FcValueListPtrU(v1))
+	 v1 = v1_ptrU->next, v1_ptrU = FcValueListPtrU(v1))
     {
-	for (v2 = v2orig, v2_ptrU = FcValueListPtrU(v2); FcValueListPtrU(v2); 
-	     v2 = FcValueListPtrU(v2)->next)
+	for (v2 = v2orig, v2_ptrU = FcValueListPtrU(v2); v2_ptrU;
+	     v2 = v2_ptrU->next, v2_ptrU = FcValueListPtrU(v2))
 	{
 	    v = (*_FcMatchers[i].compare) (&v1_ptrU->value,
 					   &v2_ptrU->value);