Mercurial > hg > xemacs-beta
diff src/objects-tty.c @ 4959:bd169a24a554
merge
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Thu, 28 Jan 2010 04:27:30 -0600 |
| parents | 304aebb79cd3 |
| children | 16112448d484 |
line wrap: on
line diff
--- a/src/objects-tty.c Thu Jan 28 04:02:14 2010 -0600 +++ b/src/objects-tty.c Thu Jan 28 04:27:30 2010 -0600 @@ -276,7 +276,7 @@ if (*str != '/') return 0; str++; - charset = Ffind_charset (intern_int (str)); + charset = Ffind_charset (intern_istring (str)); if (NILP (charset)) return 0; #else @@ -332,7 +332,7 @@ tty_font_list (Lisp_Object UNUSED (pattern), Lisp_Object UNUSED (device), Lisp_Object UNUSED (maxnumber)) { - return list1 (build_string ("normal")); + return list1 (build_ascstring ("normal")); } #ifdef MULE @@ -388,7 +388,7 @@ if (NILP (charset)) return font; - return concat3 (font, build_string ("/"), + return concat3 (font, build_ascstring ("/"), Fsymbol_name (XCHARSET_NAME (charset))); }