diff options
| author | Kenichi Handa | 2006-06-09 02:16:05 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2006-06-09 02:16:05 +0000 |
| commit | 553b54ccb0a4eb3ecc2e286a1627376954f58ae4 (patch) | |
| tree | 266edfdac2e5b8a58819597b7978fd0797fb2354 /src | |
| parent | 7b9226ba4422b50b5ad86cd29ad0c4bed11e0c18 (diff) | |
| download | emacs-553b54ccb0a4eb3ecc2e286a1627376954f58ae4.tar.gz emacs-553b54ccb0a4eb3ecc2e286a1627376954f58ae4.zip | |
(x_new_fontset2): If an ASCII font couldn't be loaded,
return Qnil.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xterm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/xterm.c b/src/xterm.c index 7407585ebf0..d5253e27906 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -8200,6 +8200,8 @@ x_new_fontset2 (f, fontsetname) | |||
| 8200 | return Qnil; | 8200 | return Qnil; |
| 8201 | 8201 | ||
| 8202 | font = fontset_ascii_font (f, fontset); | 8202 | font = fontset_ascii_font (f, fontset); |
| 8203 | if (! font) | ||
| 8204 | return Qnil; | ||
| 8203 | xfont = font->font.font; | 8205 | xfont = font->font.font; |
| 8204 | 8206 | ||
| 8205 | if (FRAME_FONT (f) == xfont) | 8207 | if (FRAME_FONT (f) == xfont) |