Mercurial > hg > xemacs-beta

comparison src/objects-tty.c @ 4959:bd169a24a554

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Thu, 28 Jan 2010 04:27:30 -0600
parents 304aebb79cd3
children 16112448d484
comparison
equal deleted inserted replaced
4893:99f2102552d7 4959:bd169a24a554
274 { 274 {
275 #ifdef MULE 275 #ifdef MULE
276 if (*str != '/') 276 if (*str != '/')
277 return 0; 277 return 0;
278 str++; 278 str++;
279 charset = Ffind_charset (intern_int (str)); 279 charset = Ffind_charset (intern_istring (str));
280 if (NILP (charset)) 280 if (NILP (charset))
281 return 0; 281 return 0;
282 #else 282 #else
283 return 0; 283 return 0;
284 #endif 284 #endif
330 330
331 static Lisp_Object 331 static Lisp_Object
332 tty_font_list (Lisp_Object UNUSED (pattern), Lisp_Object UNUSED (device), 332 tty_font_list (Lisp_Object UNUSED (pattern), Lisp_Object UNUSED (device),
333 Lisp_Object UNUSED (maxnumber)) 333 Lisp_Object UNUSED (maxnumber))
334 { 334 {
335 return list1 (build_string ("normal")); 335 return list1 (build_ascstring ("normal"));
336 } 336 }
337 337
338 #ifdef MULE 338 #ifdef MULE
339 339
340 static int 340 static int
386 } 386 }
387 387
388 if (NILP (charset)) 388 if (NILP (charset))
389 return font; 389 return font;
390 390
391 return concat3 (font, build_string ("/"), 391 return concat3 (font, build_ascstring ("/"),
392 Fsymbol_name (XCHARSET_NAME (charset))); 392 Fsymbol_name (XCHARSET_NAME (charset)));
393 } 393 }
394 394
395 #endif /* MULE */ 395 #endif /* MULE */
396 396