# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1236758017 0
# Node ID 66d0ea986f066286f7495f618fc87aee84a8bf39
# Parent  c50bd87f030b321863ac613affd903f8431c8641
(x_set_font): When ARG is a font-object, don't alter the
fontset of the frame.

diff -r c50bd87f030b -r 66d0ea986f06 src/frame.c
--- a/src/frame.c	Wed Mar 11 07:51:33 2009 +0000
+++ b/src/frame.c	Wed Mar 11 07:53:37 2009 +0000
@@ -3399,10 +3399,11 @@
   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);