[Emacs-diffs] emacs/src frame.c

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   09/01/14 12:08:49

Modified files:
        src            : frame.c 

Log message:
        (x_set_font): Always store a font to the font parameter,
        never a fontset. (Bug#1562)

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

Patches:
Index: frame.c
===================================================================
RCS file: /sources/emacs/emacs/src/frame.c,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -b -r1.409 -r1.410
--- frame.c     9 Jan 2009 07:44:01 -0000       1.409
+++ frame.c     14 Jan 2009 12:08:49 -0000      1.410
@@ -3391,7 +3391,7 @@
          font_object = font_open_by_name (f, SDATA (ascii_font));
          if (NILP (font_object))
            error ("Font `%s' is not defined", SDATA (arg));
-         arg = fontset_name (fontset);
+         arg = AREF (font_object, FONT_NAME_INDEX);
        }
       else
        error ("The default fontset can't be used for a frame font");