diff options
| author | Andreas Schwab | 2008-07-10 13:13:21 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2008-07-10 13:13:21 +0000 |
| commit | bb6588648f3f11e089d657ddcbf05e71644d93ed (patch) | |
| tree | bb0166c255dfba8f2a76c9490e6840d11887bbe0 | |
| parent | a0ce9ab7910c161bf27a182218bbeacbcf1954d6 (diff) | |
| download | emacs-bb6588648f3f11e089d657ddcbf05e71644d93ed.tar.gz emacs-bb6588648f3f11e089d657ddcbf05e71644d93ed.zip | |
(ftfont_resolve_generic_family): Remove foundry from
pattern before matching the generic family.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/ftfont.c | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9ad4e855859..a7578f2fe65 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-07-10 Andreas Schwab <schwab@suse.de> | ||
| 2 | |||
| 3 | * ftfont.c (ftfont_resolve_generic_family): Remove foundry from | ||
| 4 | pattern before matching the generic family. | ||
| 5 | |||
| 1 | 2008-07-10 Dan Nicolaescu <dann@ics.uci.edu> | 6 | 2008-07-10 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 7 | ||
| 3 | * unexec.c: | 8 | * unexec.c: |
diff --git a/src/ftfont.c b/src/ftfont.c index 31286a182c5..131e4b8aed1 100644 --- a/src/ftfont.c +++ b/src/ftfont.c | |||
| @@ -221,6 +221,7 @@ ftfont_resolve_generic_family (family, pattern) | |||
| 221 | pattern = FcPatternDuplicate (pattern); | 221 | pattern = FcPatternDuplicate (pattern); |
| 222 | if (! pattern) | 222 | if (! pattern) |
| 223 | goto err; | 223 | goto err; |
| 224 | FcPatternDel (pattern, FC_FOUNDRY); | ||
| 224 | FcPatternDel (pattern, FC_FAMILY); | 225 | FcPatternDel (pattern, FC_FAMILY); |
| 225 | FcPatternAddString (pattern, FC_FAMILY, SYMBOL_FcChar8 (family)); | 226 | FcPatternAddString (pattern, FC_FAMILY, SYMBOL_FcChar8 (family)); |
| 226 | FcConfigSubstitute (NULL, pattern, FcMatchPattern); | 227 | FcConfigSubstitute (NULL, pattern, FcMatchPattern); |