# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1231934929 0
# Node ID a94440e70b7cb10c0ae8f24c8f37df7913400ccb
# Parent  6df4439cd5951ae3aaa916fa32b29847c9dafbfb
(x_set_font): Always store a font to the font parameter,
never a fontset. (Bug#1562)

diff -r 6df4439cd595 -r a94440e70b7c src/frame.c
--- a/src/frame.c	Wed Jan 14 12:06:34 2009 +0000
+++ b/src/frame.c	Wed Jan 14 12:08:49 2009 +0000
@@ -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");