summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--src/fclang.c7
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 710ef71..285c5a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Aug 26 16:33:04 PDT 2002 keithp
+ + Owen discovered that FcLangSetHasLang wasn't actuall
+ checking the language set.
+
Mon Aug 26 13:37:23 PDT 2002 keithp
+ Append a version number to cache filenames
diff --git a/src/fclang.c b/src/fclang.c
index 1039b4b..9852ea2 100644
--- a/src/fclang.c
+++ b/src/fclang.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/lib/fontconfig/src/fclang.c,v 1.4 2002/07/12 21:06:03 keithp Exp $
+ * $XFree86: xc/lib/fontconfig/src/fclang.c,v 1.6 2002/08/22 18:53:22 keithp Exp $
*
* Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
*
@@ -275,9 +275,10 @@ FcLangSetHasLang (const FcLangSet *ls, const FcChar8 *lang)
int i;
id = FcLangSetIndex (lang);
- if (id >= 0)
+ if (id < 0)
+ id = -id - 1;
+ else if (FcLangSetBitGet (ls, id))
return FcLangEqual;
- id = -id - 1;
best = FcLangDifferentLang;
for (i = id - 1; i >= 0; i--)
{