summaryrefslogtreecommitdiff
path: root/src/frame.c
diff options
context:
space:
mode:
authorJason Rumney <jasonr@gnu.org>2009-01-14 12:08:49 +0000
committerJason Rumney <jasonr@gnu.org>2009-01-14 12:08:49 +0000
commit97d42150b4f0233e98f516e69f4978b2e6eebe59 (patch)
treedf7341af45451e5d4e308847e2d4f9c70716b910 /src/frame.c
parentecbe9da5b7fb8e7e6ab63222823bca213cef1955 (diff)
downloademacs-97d42150b4f0233e98f516e69f4978b2e6eebe59.tar.gz
(x_set_font): Always store a font to the font parameter,
never a fontset. (Bug#1562)
Diffstat (limited to 'src/frame.c')
-rw-r--r--src/frame.c2
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)
font_object = font_open_by_name (f, SDATA (ascii_font));
if (NILP (font_object))
error ("Font `%s' is not defined", SDATA (arg));
- arg = fontset_name (fontset);
+ arg = AREF (font_object, FONT_NAME_INDEX);
}
else
error ("The default fontset can't be used for a frame font");