diff options
| author | Chong Yidong | 2010-02-26 21:09:03 -0500 |
|---|---|---|
| committer | Chong Yidong | 2010-02-26 21:09:03 -0500 |
| commit | 4ed28cf4e5fe36f460adb103865c3adcbad62da3 (patch) | |
| tree | 2514a80c064aa9523ab6c1cc13161fc256160345 /src | |
| parent | fe69a72236d483ea3ce08084d0a6a315a82b5cab (diff) | |
| download | emacs-4ed28cf4e5fe36f460adb103865c3adcbad62da3.tar.gz emacs-4ed28cf4e5fe36f460adb103865c3adcbad62da3.zip | |
Addendum to last patch: add "Medium" GTK font name keyword.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/font.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 67a547a8058..ac909cc7885 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | 2010-02-27 Chong Yidong <cyd@stupidchicken.com> | 1 | 2010-02-27 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 2 | ||
| 3 | * font.c (font_parse_fcname): Recognize "Book", "Condensed", and | 3 | * font.c (font_parse_fcname): Recognize "Book", "Condensed", |
| 4 | "Semi-Condensed" keywords in GTK names (Bug#5646). | 4 | "Medium", and "Semi-Condensed" keywords in GTK names (Bug#5646). |
| 5 | 5 | ||
| 6 | 2010-02-26 Kenichi Handa <handa@m17n.org> | 6 | 2010-02-26 Kenichi Handa <handa@m17n.org> |
| 7 | 7 | ||
diff --git a/src/font.c b/src/font.c index de84dc43d53..765712198fe 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -1582,6 +1582,12 @@ font_parse_fcname (name, font) | |||
| 1582 | prop = font_intern_prop ("book", 4, 1); | 1582 | prop = font_intern_prop ("book", 4, 1); |
| 1583 | FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop); | 1583 | FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop); |
| 1584 | } | 1584 | } |
| 1585 | else if (PROP_MATCH ("Medium", 6)) | ||
| 1586 | { | ||
| 1587 | prop_found = 1; | ||
| 1588 | prop = font_intern_prop ("medium", 6, 1); | ||
| 1589 | FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop); | ||
| 1590 | } | ||
| 1585 | else if (PROP_MATCH ("Semi-Bold", 9)) | 1591 | else if (PROP_MATCH ("Semi-Bold", 9)) |
| 1586 | { | 1592 | { |
| 1587 | prop_found = 1; | 1593 | prop_found = 1; |