Mercurial > hg > xemacs-beta

comparison src/faces.c @ 5471:00e79bbbe48f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with trunk.
author Mats Lidell <matsl@xemacs.org>
date Mon, 14 Feb 2011 22:43:46 +0100
parents 308d34e9f07d 22c4e67a2e69
children 4dee0387b9de
comparison
equal deleted inserted replaced
5470:0af042a0c116 5471:00e79bbbe48f
2262 2262
2263 { 2263 {
2264 Lisp_Object fg_fb = Qnil, bg_fb = Qnil; 2264 Lisp_Object fg_fb = Qnil, bg_fb = Qnil;
2265 2265
2266 #ifdef HAVE_GTK 2266 #ifdef HAVE_GTK
2267 fg_fb = acons (list1 (Qgtk), build_ascstring ("black"), fg_fb); 2267 fg_fb = Facons (list1 (Qgtk), build_ascstring ("black"), fg_fb);
2268 bg_fb = acons (list1 (Qgtk), build_ascstring ("white"), bg_fb); 2268 bg_fb = Facons (list1 (Qgtk), build_ascstring ("white"), bg_fb);
2269 #endif 2269 #endif
2270 #ifdef HAVE_X_WINDOWS 2270 #ifdef HAVE_X_WINDOWS
2271 fg_fb = acons (list1 (Qx), build_ascstring ("black"), fg_fb); 2271 fg_fb = Facons (list1 (Qx), build_ascstring ("black"), fg_fb);
2272 bg_fb = acons (list1 (Qx), build_ascstring ("gray80"), bg_fb); 2272 bg_fb = Facons (list1 (Qx), build_ascstring ("gray80"), bg_fb);
2273 #endif 2273 #endif
2274 #ifdef HAVE_TTY 2274 #ifdef HAVE_TTY
2275 fg_fb = acons (list1 (Qtty), Fvector (0, 0), fg_fb); 2275 fg_fb = Facons (list1 (Qtty), Fvector (0, 0), fg_fb);
2276 bg_fb = acons (list1 (Qtty), Fvector (0, 0), bg_fb); 2276 bg_fb = Facons (list1 (Qtty), Fvector (0, 0), bg_fb);
2277 #endif 2277 #endif
2278 #ifdef HAVE_MS_WINDOWS 2278 #ifdef HAVE_MS_WINDOWS
2279 fg_fb = acons (list1 (Qmsprinter), build_ascstring ("black"), fg_fb); 2279 fg_fb = Facons (list1 (Qmsprinter), build_ascstring ("black"), fg_fb);
2280 bg_fb = acons (list1 (Qmsprinter), build_ascstring ("white"), bg_fb); 2280 bg_fb = Facons (list1 (Qmsprinter), build_ascstring ("white"), bg_fb);
2281 fg_fb = acons (list1 (Qmswindows), build_ascstring ("black"), fg_fb); 2281 fg_fb = Facons (list1 (Qmswindows), build_ascstring ("black"), fg_fb);
2282 bg_fb = acons (list1 (Qmswindows), build_ascstring ("white"), bg_fb); 2282 bg_fb = Facons (list1 (Qmswindows), build_ascstring ("white"), bg_fb);
2283 #endif 2283 #endif
2284 set_specifier_fallback (Fget (Vdefault_face, Qforeground, Qnil), fg_fb); 2284 set_specifier_fallback (Fget (Vdefault_face, Qforeground, Qnil), fg_fb);
2285 set_specifier_fallback (Fget (Vdefault_face, Qbackground, Qnil), bg_fb); 2285 set_specifier_fallback (Fget (Vdefault_face, Qbackground, Qnil), bg_fb);
2286 } 2286 }
2287 2287
2515 But it gets referred to later! */ 2515 But it gets referred to later! */
2516 #ifdef HAVE_GTK 2516 #ifdef HAVE_GTK
2517 /* We need to put something in there, or error checking gets 2517 /* We need to put something in there, or error checking gets
2518 #%!@#ed up before the styles are set, which override the 2518 #%!@#ed up before the styles are set, which override the
2519 fallbacks. */ 2519 fallbacks. */
2520 fg_fb = acons (list1 (Qgtk), build_ascstring ("black"), fg_fb); 2520 fg_fb = Facons (list1 (Qgtk), build_ascstring ("black"), fg_fb);
2521 bg_fb = acons (list1 (Qgtk), build_ascstring ("Gray80"), bg_fb); 2521 bg_fb = Facons (list1 (Qgtk), build_ascstring ("Gray80"), bg_fb);
2522 #endif 2522 #endif
2523 #ifdef HAVE_X_WINDOWS 2523 #ifdef HAVE_X_WINDOWS
2524 fg_fb = acons (list1 (Qx), build_ascstring ("black"), fg_fb); 2524 fg_fb = Facons (list1 (Qx), build_ascstring ("black"), fg_fb);
2525 bg_fb = acons (list1 (Qx), build_ascstring ("Gray80"), bg_fb); 2525 bg_fb = Facons (list1 (Qx), build_ascstring ("Gray80"), bg_fb);
2526 #endif 2526 #endif
2527 #ifdef HAVE_TTY 2527 #ifdef HAVE_TTY
2528 fg_fb = acons (list1 (Qtty), Fvector (0, 0), fg_fb); 2528 fg_fb = Facons (list1 (Qtty), Fvector (0, 0), fg_fb);
2529 bg_fb = acons (list1 (Qtty), Fvector (0, 0), bg_fb); 2529 bg_fb = Facons (list1 (Qtty), Fvector (0, 0), bg_fb);
2530 #endif 2530 #endif
2531 #ifdef HAVE_MS_WINDOWS 2531 #ifdef HAVE_MS_WINDOWS
2532 fg_fb = acons (list1 (Qmsprinter), build_ascstring ("black"), fg_fb); 2532 fg_fb = Facons (list1 (Qmsprinter), build_ascstring ("black"), fg_fb);
2533 bg_fb = acons (list1 (Qmsprinter), build_ascstring ("white"), bg_fb); 2533 bg_fb = Facons (list1 (Qmsprinter), build_ascstring ("white"), bg_fb);
2534 fg_fb = acons (list1 (Qmswindows), build_ascstring ("black"), fg_fb); 2534 fg_fb = Facons (list1 (Qmswindows), build_ascstring ("black"), fg_fb);
2535 bg_fb = acons (list1 (Qmswindows), build_ascstring ("Gray75"), bg_fb); 2535 bg_fb = Facons (list1 (Qmswindows), build_ascstring ("Gray75"), bg_fb);
2536 #endif 2536 #endif
2537 set_specifier_fallback (Fget (Vgui_element_face, Qforeground, Qnil), fg_fb); 2537 set_specifier_fallback (Fget (Vgui_element_face, Qforeground, Qnil), fg_fb);
2538 set_specifier_fallback (Fget (Vgui_element_face, Qbackground, Qnil), bg_fb); 2538 set_specifier_fallback (Fget (Vgui_element_face, Qbackground, Qnil), bg_fb);
2539 } 2539 }
2540 2540