From b17ae93a91ca4fc4fca4803d4ea5f649156674d4 Mon Sep 17 00:00:00 2001
From: Kenichi Handa <handa@m17n.org>
Date: Wed, 11 Mar 2009 07:53:37 +0000
Subject: [PATCH] (x_set_font): When ARG is a font-object, don't alter the
 fontset of the frame.

---
 src/frame.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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);
-- 
2.11.4.GIT