Mercurial > emacs

diff src/frame.c @ 101171:a94440e70b7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(x_set_font): Always store a font to the font parameter, never a fontset. (Bug#1562)
author Jason Rumney <jasonr@gnu.org>
date Wed, 14 Jan 2009 12:08:49 +0000
parents f883a64629e1
children 66d0ea986f06
line wrap: on
line diff
--- 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");