diff options
| author | Chong Yidong | 2008-10-08 22:59:02 +0000 |
|---|---|---|
| committer | Chong Yidong | 2008-10-08 22:59:02 +0000 |
| commit | f3d295514c7d0e320a8b3b407369158fe0790d7f (patch) | |
| tree | 95f8686a5417e4783264181206f2f6cae585e310 /src | |
| parent | edc3ecf3972954d8f11f57ed54d45cc055ccb0ea (diff) | |
| download | emacs-f3d295514c7d0e320a8b3b407369158fe0790d7f.tar.gz emacs-f3d295514c7d0e320a8b3b407369158fe0790d7f.zip | |
(fontset_find_font): Check frame validity.
Diffstat (limited to 'src')
| -rw-r--r-- | src/fontset.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fontset.c b/src/fontset.c index 2979afe55fb..8061a2b90ab 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -516,9 +516,9 @@ fontset_find_font (fontset, c, face, id, fallback) | |||
| 516 | int id, fallback; | 516 | int id, fallback; |
| 517 | { | 517 | { |
| 518 | Lisp_Object elt, vec, font_group; | 518 | Lisp_Object elt, vec, font_group; |
| 519 | int i; | 519 | int i, charset_matched = -1; |
| 520 | FRAME_PTR f = XFRAME (FONTSET_FRAME (fontset)); | 520 | FRAME_PTR f = (FRAMEP (FONTSET_FRAME (fontset))) |
| 521 | int charset_matched = -1; | 521 | ? XFRAME (selected_frame) : XFRAME (FONTSET_FRAME (fontset)); |
| 522 | 522 | ||
| 523 | font_group = fontset_get_font_group (fontset, fallback ? -1 : c); | 523 | font_group = fontset_get_font_group (fontset, fallback ? -1 : c); |
| 524 | if (! CONSP (font_group)) | 524 | if (! CONSP (font_group)) |