comparison 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
comparison
equal deleted inserted replaced
15:ad457d5f7d04 16:0293115a14e9
220 220
221 static int 221 static int
222 tty_initialize_font_instance (struct Lisp_Font_Instance *f, Lisp_Object name, 222 tty_initialize_font_instance (struct Lisp_Font_Instance *f, Lisp_Object name,
223 Lisp_Object device, Error_behavior errb) 223 Lisp_Object device, Error_behavior errb)
224 { 224 {
225 Bufbyte *str = string_data (XSTRING (name)); 225 Bufbyte *str = XSTRING_DATA (name);
226 Lisp_Object charset = Qnil; 226 Lisp_Object charset = Qnil;
227 227
228 if (strncmp ((CONST char *) str, "normal", 6)) 228 if (strncmp ((CONST char *) str, "normal", 6))
229 return 0; 229 return 0;
230 str += 6; 230 str += 6;
234 } 234 }
235 235
236 /* Don't allocate the data until we're sure that we will succeed. */ 236 /* Don't allocate the data until we're sure that we will succeed. */
237 f->data = malloc_type (struct tty_font_instance_data); 237 f->data = malloc_type (struct tty_font_instance_data);
238 FONT_INSTANCE_TTY_CHARSET (f) = charset; 238 FONT_INSTANCE_TTY_CHARSET (f) = charset;
239 f->width = 1; 239 f->width = 1;
240 240
241 f->proportional_p = 0; 241 f->proportional_p = 0;
242 f->ascent = f->height = 1; 242 f->ascent = f->height = 1;
243 f->descent = 0; 243 f->descent = 0;
244 244