diff options
| author | Jason Rumney | 2009-01-14 12:08:49 +0000 |
|---|---|---|
| committer | Jason Rumney | 2009-01-14 12:08:49 +0000 |
| commit | 97d42150b4f0233e98f516e69f4978b2e6eebe59 (patch) | |
| tree | df7341af45451e5d4e308847e2d4f9c70716b910 /src | |
| parent | ecbe9da5b7fb8e7e6ab63222823bca213cef1955 (diff) | |
| download | emacs-97d42150b4f0233e98f516e69f4978b2e6eebe59.tar.gz emacs-97d42150b4f0233e98f516e69f4978b2e6eebe59.zip | |
(x_set_font): Always store a font to the font parameter,
never a fontset. (Bug#1562)
Diffstat (limited to 'src')
| -rw-r--r-- | src/frame.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/frame.c b/src/frame.c index 7db5a1e1fcb..7074e14077e 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -3391,7 +3391,7 @@ x_set_font (f, arg, oldval) | |||
| 3391 | font_object = font_open_by_name (f, SDATA (ascii_font)); | 3391 | font_object = font_open_by_name (f, SDATA (ascii_font)); |
| 3392 | if (NILP (font_object)) | 3392 | if (NILP (font_object)) |
| 3393 | error ("Font `%s' is not defined", SDATA (arg)); | 3393 | error ("Font `%s' is not defined", SDATA (arg)); |
| 3394 | arg = fontset_name (fontset); | 3394 | arg = AREF (font_object, FONT_NAME_INDEX); |
| 3395 | } | 3395 | } |
| 3396 | else | 3396 | else |
| 3397 | error ("The default fontset can't be used for a frame font"); | 3397 | error ("The default fontset can't be used for a frame font"); |