diff src/objects-tty.c @ 16:0293115a14e9 r19-15b91

Import from CVS: tag r19-15b91
author cvs
date Mon, 13 Aug 2007 08:49:20 +0200
parents 376386a54a3c
children 859a2309aef8
line wrap: on
line diff
--- a/src/objects-tty.c	Mon Aug 13 08:48:43 2007 +0200
+++ b/src/objects-tty.c	Mon Aug 13 08:49:20 2007 +0200
@@ -222,7 +222,7 @@
 tty_initialize_font_instance (struct Lisp_Font_Instance *f, Lisp_Object name,
 			      Lisp_Object device, Error_behavior errb)
 {
-  Bufbyte *str = string_data (XSTRING (name));
+  Bufbyte *str = XSTRING_DATA (name);
   Lisp_Object charset = Qnil;
 
   if (strncmp ((CONST char *) str, "normal", 6))
@@ -236,7 +236,7 @@
   /* Don't allocate the data until we're sure that we will succeed. */
   f->data = malloc_type (struct tty_font_instance_data);
   FONT_INSTANCE_TTY_CHARSET (f) = charset;
-  f->width = 1;
+    f->width = 1;
 
   f->proportional_p = 0;
   f->ascent = f->height = 1;