[Emacs-diffs] emacs/src frame.c

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   09/03/11 07:53:37

Modified files:
        src            : frame.c 

Log message:
        (x_set_font): When ARG is a font-object, don't alter the
        fontset of the frame.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/frame.c?cvsroot=emacs&r1=1.410&r2=1.411

Patches:
Index: frame.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/frame.c,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -b -r1.410 -r1.411
--- frame.c     14 Jan 2009 12:08:49 -0000      1.410
+++ frame.c     11 Mar 2009 07:53:37 -0000      1.411
@@ -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);