Commit b17ae93a authored by Kenichi Handa's avatar Kenichi Handa
Browse files

(x_set_font): When ARG is a font-object, don't alter the

fontset of the frame.
parent d6490542
...@@ -3399,10 +3399,11 @@ x_set_font (f, arg, oldval) ...@@ -3399,10 +3399,11 @@ x_set_font (f, arg, oldval)
else if (FONT_OBJECT_P (arg)) else if (FONT_OBJECT_P (arg))
{ {
font_object = arg; font_object = arg;
/* This is store the XLFD font name in the frame parameter for /* This is to store the XLFD font name in the frame parameter for
backward compatiblity. We should store the font-object backward compatiblity. We should store the font-object
itself in the future. */ itself in the future. */
arg = AREF (font_object, FONT_NAME_INDEX); arg = AREF (font_object, FONT_NAME_INDEX);
fontset = FRAME_FONTSET (f);
} }
else else
signal_error ("Invalid font", arg); signal_error ("Invalid font", arg);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment