diff options
| author | Kenichi Handa | 2008-01-25 11:26:27 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2008-01-25 11:26:27 +0000 |
| commit | c8ea71f6869bbb2fb4dee9ab74da81c497f2e799 (patch) | |
| tree | b360a769e423edd701bf9f3c85ed9bd9db1fba78 /src | |
| parent | 55d6c8ac6e02e58a8af140285a11ac48032f7a76 (diff) | |
| download | emacs-c8ea71f6869bbb2fb4dee9ab74da81c497f2e799.tar.gz emacs-c8ea71f6869bbb2fb4dee9ab74da81c497f2e799.zip | |
(font_load_for_face): Handle the case that the font in
face->lface is a string.
Diffstat (limited to 'src')
| -rw-r--r-- | src/font.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/font.c b/src/font.c index f9097d1f064..1e95315bdaf 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -2753,6 +2753,10 @@ font_load_for_face (f, face) | |||
| 2753 | if (! NILP (entity)) | 2753 | if (! NILP (entity)) |
| 2754 | font_object = font_open_for_lface (f, entity, face->lface, Qnil); | 2754 | font_object = font_open_for_lface (f, entity, face->lface, Qnil); |
| 2755 | } | 2755 | } |
| 2756 | else if (STRINGP (font_object)) | ||
| 2757 | { | ||
| 2758 | font_object = font_open_by_name (f, SDATA (font_object)); | ||
| 2759 | } | ||
| 2756 | 2760 | ||
| 2757 | if (! NILP (font_object)) | 2761 | if (! NILP (font_object)) |
| 2758 | { | 2762 | { |