summaryrefslogtreecommitdiff
path: root/src/frame.c
diff options
context:
space:
mode:
authorKenichi Handa <handa@m17n.org>2009-03-11 07:53:37 +0000
committerKenichi Handa <handa@m17n.org>2009-03-11 07:53:37 +0000
commitb17ae93a91ca4fc4fca4803d4ea5f649156674d4 (patch)
tree71a8a15f7df47c855de9d05fc1139fd16c8974dd /src/frame.c
parentd64905422625b01c4f6ffcb4276c6021070d6899 (diff)
downloademacs-b17ae93a91ca4fc4fca4803d4ea5f649156674d4.tar.gz
emacs-b17ae93a91ca4fc4fca4803d4ea5f649156674d4.tar.bz2
emacs-b17ae93a91ca4fc4fca4803d4ea5f649156674d4.zip
(x_set_font): When ARG is a font-object, don't alter the
fontset of the frame.
Diffstat (limited to 'src/frame.c')
-rw-r--r--src/frame.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/frame.c b/src/frame.c
index 7074e14077e..52733044f7a 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3399,10 +3399,11 @@ x_set_font (f, arg, oldval)
else if (FONT_OBJECT_P (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
itself in the future. */
arg = AREF (font_object, FONT_NAME_INDEX);
+ fontset = FRAME_FONTSET (f);
}
else
signal_error ("Invalid font", arg);