diff options
| author | Jan Djärv | 2010-01-05 15:42:39 +0100 |
|---|---|---|
| committer | Jan Djärv | 2010-01-05 15:42:39 +0100 |
| commit | 2889df585ae164ccf8fc57ffdbb432dfcd75e870 (patch) | |
| tree | 2fbd5bb635987af59cb98761f389b8d3747e8752 /src/fontset.c | |
| parent | 451f23ab90cbbd98de861ed8dff0bd4ffdda3bdf (diff) | |
| parent | 03f77f0a4470c967d6f4351d347ebedd8fb882bb (diff) | |
| download | emacs-2889df585ae164ccf8fc57ffdbb432dfcd75e870.tar.gz emacs-2889df585ae164ccf8fc57ffdbb432dfcd75e870.zip | |
Merge from mainline.
Diffstat (limited to 'src/fontset.c')
| -rw-r--r-- | src/fontset.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fontset.c b/src/fontset.c index 30620e511c8..b62c779be70 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -533,8 +533,8 @@ fontset_find_font (fontset, c, face, id, fallback) | |||
| 533 | { | 533 | { |
| 534 | Lisp_Object vec, font_group; | 534 | Lisp_Object vec, font_group; |
| 535 | int i, charset_matched = 0, found_index; | 535 | int i, charset_matched = 0, found_index; |
| 536 | FRAME_PTR f = (FRAMEP (FONTSET_FRAME (fontset))) | 536 | FRAME_PTR f = (FRAMEP (FONTSET_FRAME (fontset)) |
| 537 | ? XFRAME (selected_frame) : XFRAME (FONTSET_FRAME (fontset)); | 537 | ? XFRAME (FONTSET_FRAME (fontset)) : XFRAME (selected_frame)); |
| 538 | Lisp_Object rfont_def; | 538 | Lisp_Object rfont_def; |
| 539 | 539 | ||
| 540 | font_group = fontset_get_font_group (fontset, fallback ? -1 : c); | 540 | font_group = fontset_get_font_group (fontset, fallback ? -1 : c); |