Mercurial > hg > xemacs-beta

comparison src/faces.c @ 5354:22c4e67a2e69

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove #'acons from cl.el, make the version in alloc.c visible to Lisp src/ChangeLog addition: 2011-02-09 Aidan Kehoe <kehoea@parhasard.net> * alloc.c (Facons): * alloc.c (Fobject_memory_usage): * alloc.c (syms_of_alloc): * faces.c (complex_vars_of_faces): * lisp.h: * mc-alloc.c (Fmc_alloc_memory_usage): Rename acons() to Facons(), make it visible to Lisp. Change uses of the function in C accordingly. lisp/ChangeLog addition: 2011-02-09 Aidan Kehoe <kehoea@parhasard.net> * cl.el (acons): Removed, make the implementation in alloc.c visible to Lisp instead.
author Aidan Kehoe <kehoea@parhasard.net>
date Wed, 09 Feb 2011 20:15:50 +0000
parents 18c0b5909d16
children 3889ef128488 00e79bbbe48f
comparison
equal deleted inserted replaced
5353:38e24b8be4ea 5354:22c4e67a2e69
2264 2264
2265 { 2265 {
2266 Lisp_Object fg_fb = Qnil, bg_fb = Qnil; 2266 Lisp_Object fg_fb = Qnil, bg_fb = Qnil;
2267 2267
2268 #ifdef HAVE_GTK 2268 #ifdef HAVE_GTK
2269 fg_fb = acons (list1 (Qgtk), build_ascstring ("black"), fg_fb); 2269 fg_fb = Facons (list1 (Qgtk), build_ascstring ("black"), fg_fb);
2270 bg_fb = acons (list1 (Qgtk), build_ascstring ("white"), bg_fb); 2270 bg_fb = Facons (list1 (Qgtk), build_ascstring ("white"), bg_fb);
2271 #endif 2271 #endif
2272 #ifdef HAVE_X_WINDOWS 2272 #ifdef HAVE_X_WINDOWS
2273 fg_fb = acons (list1 (Qx), build_ascstring ("black"), fg_fb); 2273 fg_fb = Facons (list1 (Qx), build_ascstring ("black"), fg_fb);
2274 bg_fb = acons (list1 (Qx), build_ascstring ("gray80"), bg_fb); 2274 bg_fb = Facons (list1 (Qx), build_ascstring ("gray80"), bg_fb);
2275 #endif 2275 #endif
2276 #ifdef HAVE_TTY 2276 #ifdef HAVE_TTY
2277 fg_fb = acons (list1 (Qtty), Fvector (0, 0), fg_fb); 2277 fg_fb = Facons (list1 (Qtty), Fvector (0, 0), fg_fb);
2278 bg_fb = acons (list1 (Qtty), Fvector (0, 0), bg_fb); 2278 bg_fb = Facons (list1 (Qtty), Fvector (0, 0), bg_fb);
2279 #endif 2279 #endif
2280 #ifdef HAVE_MS_WINDOWS 2280 #ifdef HAVE_MS_WINDOWS
2281 fg_fb = acons (list1 (Qmsprinter), build_ascstring ("black"), fg_fb); 2281 fg_fb = Facons (list1 (Qmsprinter), build_ascstring ("black"), fg_fb);
2282 bg_fb = acons (list1 (Qmsprinter), build_ascstring ("white"), bg_fb); 2282 bg_fb = Facons (list1 (Qmsprinter), build_ascstring ("white"), bg_fb);
2283 fg_fb = acons (list1 (Qmswindows), build_ascstring ("black"), fg_fb); 2283 fg_fb = Facons (list1 (Qmswindows), build_ascstring ("black"), fg_fb);
2284 bg_fb = acons (list1 (Qmswindows), build_ascstring ("white"), bg_fb); 2284 bg_fb = Facons (list1 (Qmswindows), build_ascstring ("white"), bg_fb);
2285 #endif 2285 #endif
2286 set_specifier_fallback (Fget (Vdefault_face, Qforeground, Qnil), fg_fb); 2286 set_specifier_fallback (Fget (Vdefault_face, Qforeground, Qnil), fg_fb);
2287 set_specifier_fallback (Fget (Vdefault_face, Qbackground, Qnil), bg_fb); 2287 set_specifier_fallback (Fget (Vdefault_face, Qbackground, Qnil), bg_fb);
2288 } 2288 }
2289 2289
2517 But it gets referred to later! */ 2517 But it gets referred to later! */
2518 #ifdef HAVE_GTK 2518 #ifdef HAVE_GTK
2519 /* We need to put something in there, or error checking gets 2519 /* We need to put something in there, or error checking gets
2520 #%!@#ed up before the styles are set, which override the 2520 #%!@#ed up before the styles are set, which override the
2521 fallbacks. */ 2521 fallbacks. */
2522 fg_fb = acons (list1 (Qgtk), build_ascstring ("black"), fg_fb); 2522 fg_fb = Facons (list1 (Qgtk), build_ascstring ("black"), fg_fb);
2523 bg_fb = acons (list1 (Qgtk), build_ascstring ("Gray80"), bg_fb); 2523 bg_fb = Facons (list1 (Qgtk), build_ascstring ("Gray80"), bg_fb);
2524 #endif 2524 #endif
2525 #ifdef HAVE_X_WINDOWS 2525 #ifdef HAVE_X_WINDOWS
2526 fg_fb = acons (list1 (Qx), build_ascstring ("black"), fg_fb); 2526 fg_fb = Facons (list1 (Qx), build_ascstring ("black"), fg_fb);
2527 bg_fb = acons (list1 (Qx), build_ascstring ("Gray80"), bg_fb); 2527 bg_fb = Facons (list1 (Qx), build_ascstring ("Gray80"), bg_fb);
2528 #endif 2528 #endif
2529 #ifdef HAVE_TTY 2529 #ifdef HAVE_TTY
2530 fg_fb = acons (list1 (Qtty), Fvector (0, 0), fg_fb); 2530 fg_fb = Facons (list1 (Qtty), Fvector (0, 0), fg_fb);
2531 bg_fb = acons (list1 (Qtty), Fvector (0, 0), bg_fb); 2531 bg_fb = Facons (list1 (Qtty), Fvector (0, 0), bg_fb);
2532 #endif 2532 #endif
2533 #ifdef HAVE_MS_WINDOWS 2533 #ifdef HAVE_MS_WINDOWS
2534 fg_fb = acons (list1 (Qmsprinter), build_ascstring ("black"), fg_fb); 2534 fg_fb = Facons (list1 (Qmsprinter), build_ascstring ("black"), fg_fb);
2535 bg_fb = acons (list1 (Qmsprinter), build_ascstring ("white"), bg_fb); 2535 bg_fb = Facons (list1 (Qmsprinter), build_ascstring ("white"), bg_fb);
2536 fg_fb = acons (list1 (Qmswindows), build_ascstring ("black"), fg_fb); 2536 fg_fb = Facons (list1 (Qmswindows), build_ascstring ("black"), fg_fb);
2537 bg_fb = acons (list1 (Qmswindows), build_ascstring ("Gray75"), bg_fb); 2537 bg_fb = Facons (list1 (Qmswindows), build_ascstring ("Gray75"), bg_fb);
2538 #endif 2538 #endif
2539 set_specifier_fallback (Fget (Vgui_element_face, Qforeground, Qnil), fg_fb); 2539 set_specifier_fallback (Fget (Vgui_element_face, Qforeground, Qnil), fg_fb);
2540 set_specifier_fallback (Fget (Vgui_element_face, Qbackground, Qnil), bg_fb); 2540 set_specifier_fallback (Fget (Vgui_element_face, Qbackground, Qnil), bg_fb);
2541 } 2541 }
2542 2542