comparison src/faces.c @ 5119:d877c14318b3 ben-lisp-object

merge in latest-fix changes
author Ben Wing <ben@xemacs.org>
date Sat, 26 Dec 2009 21:22:48 -0600
parents e0db3c197671 11daf37dae4d
children 623d57b7fbe8
comparison
equal deleted inserted replaced
5118:e0db3c197671 5119:d877c14318b3
2270 Lisp_Object device_symbol = Qgtk; 2270 Lisp_Object device_symbol = Qgtk;
2271 #else 2271 #else
2272 Lisp_Object device_symbol = Qx; 2272 Lisp_Object device_symbol = Qx;
2273 #endif 2273 #endif
2274 2274
2275 #if defined (USE_XFT) || defined (MULE)
2275 const Ascbyte **fontptr; 2276 const Ascbyte **fontptr;
2276 2277
2277 const Ascbyte *fonts[] = 2278 const Ascbyte *fonts[] =
2278 { 2279 {
2279 #ifdef USE_XFT 2280 #ifdef USE_XFT
2299 corresponding to one of them fails!) */ 2300 corresponding to one of them fails!) */
2300 "-*-*-medium-r-*-*-*-160-*-*-c-*-*-*", 2301 "-*-*-medium-r-*-*-*-160-*-*-c-*-*-*",
2301 "-*-*-medium-r-*-*-*-170-*-*-c-*-*-*", 2302 "-*-*-medium-r-*-*-*-170-*-*-c-*-*-*",
2302 #endif 2303 #endif
2303 }; 2304 };
2305 #endif /* defined (USE_XFT) || defined (MULE) */
2304 2306
2305 #ifdef MULE 2307 #ifdef MULE
2306 2308
2307 /* Define some specifier tags for classes of character sets. Combining 2309 /* Define some specifier tags for classes of character sets. Combining
2308 these allows for distinct fallback fonts for distinct dimensions of 2310 these allows for distinct fallback fonts for distinct dimensions of