diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-01 09:35:49 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-01 09:35:49 +0100 |
| commit | d78d8436d799f19f61642849e31e9ed6af3e6ae2 (patch) | |
| tree | 436d3d26ae0fe678e3751a9dba65162ac54b2597 /fontconfig/src/fccfg.c | |
| parent | 49c196c1056aaed97ff5cf43beff5c436d783b99 (diff) | |
| parent | a6d5f8de1394c338d01b65be7dba3520bf8bdf4b (diff) | |
| download | vcxsrv-d78d8436d799f19f61642849e31e9ed6af3e6ae2.tar.gz vcxsrv-d78d8436d799f19f61642849e31e9ed6af3e6ae2.tar.bz2 vcxsrv-d78d8436d799f19f61642849e31e9ed6af3e6ae2.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xkeyboard-config fontconfig mesa git update 1 feb 2013
Diffstat (limited to 'fontconfig/src/fccfg.c')
| -rw-r--r-- | fontconfig/src/fccfg.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/fontconfig/src/fccfg.c b/fontconfig/src/fccfg.c index 12d7e1a97..db878d5f4 100644 --- a/fontconfig/src/fccfg.c +++ b/fontconfig/src/fccfg.c @@ -1701,6 +1701,16 @@ FcConfigSubstituteWithPat (FcConfig *config, case FcOpAppendLast: FcConfigPatternAdd (p, e->object, l, FcTrue); break; + case FcOpDelete: + if (t) + { + FcConfigDel (&st[i].elt->values, st[i].value); + break; + } + /* fall through ... */ + case FcOpDeleteAll: + FcConfigPatternDel (p, e->object); + break; default: FcValueListDestroy (l); break; |