From: Jason Rumney <jasonr@gnu.org>
Date: Wed, 14 Jan 2009 12:08:49 +0000 (+0000)
Subject: (x_set_font): Always store a font to the font parameter,
X-Git-Tag: emacs-pretest-23.0.90~467
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=97d42150b4f0233e98f516e69f4978b2e6eebe59;p=emacs.git

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

diff --git a/src/frame.c b/src/frame.c
index 7db5a1e1fcb..7074e14077e 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3391,7 +3391,7 @@ x_set_font (f, arg, oldval)
 	  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");