Mercurial > hg > xemacs-beta

comparison src/objects-xlike-inc.c @ 4985:358aa3bb603f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automatic merge
author Ben Wing <ben@xemacs.org>
date Fri, 05 Feb 2010 12:12:28 -0600
parents 4aebb0131297
children d95c102a96d3
comparison
equal deleted inserted replaced
4984:f23cd0184dcf 4985:358aa3bb603f
114 const Ibyte *the_nonreloc; 114 const Ibyte *the_nonreloc;
115 115
116 if (!NILP(reloc)) 116 if (!NILP(reloc))
117 { 117 {
118 the_nonreloc = XSTRING_DATA (reloc); 118 the_nonreloc = XSTRING_DATA (reloc);
119 LISP_STRING_TO_EXTERNAL (reloc, extname, Qx_font_name_encoding); 119 extname = LISP_STRING_TO_EXTERNAL (reloc, Qx_font_name_encoding);
120 rf = xft_open_font_by_name (dpy, extname); 120 rf = xft_open_font_by_name (dpy, extname);
121 return 0; /* #### maybe this will compile and run ;) */ 121 return 0; /* #### maybe this will compile and run ;) */
122 /* Jesus, Stephen, what the fuck? */ 122 /* Jesus, Stephen, what the fuck? */
123 } 123 }
124 } 124 }
423 FcCharSet *fccs = NULL; 423 FcCharSet *fccs = NULL;
424 DECLARE_EISTRING (eistr_shortname); /* user-friendly nickname */ 424 DECLARE_EISTRING (eistr_shortname); /* user-friendly nickname */
425 DECLARE_EISTRING (eistr_longname); /* omit FC_LANG and FC_CHARSET */ 425 DECLARE_EISTRING (eistr_longname); /* omit FC_LANG and FC_CHARSET */
426 DECLARE_EISTRING (eistr_fullname); /* everything */ 426 DECLARE_EISTRING (eistr_fullname); /* everything */
427 427
428 LISP_STRING_TO_EXTERNAL (font, patternext, Qfc_font_name_encoding); 428 patternext = LISP_STRING_TO_EXTERNAL (font, Qfc_font_name_encoding);
429 fcc = FcConfigGetCurrent (); 429 fcc = FcConfigGetCurrent ();
430 430
431 /* parse the name, do the substitutions, and match the font */ 431 /* parse the name, do the substitutions, and match the font */
432 432
433 { 433 {