Mercurial > hg > xemacs-beta
diff src/faces.c @ 5354:22c4e67a2e69
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 |
line wrap: on
line diff
--- a/src/faces.c Mon Feb 07 12:01:24 2011 +0000 +++ b/src/faces.c Wed Feb 09 20:15:50 2011 +0000 @@ -2266,22 +2266,22 @@ Lisp_Object fg_fb = Qnil, bg_fb = Qnil; #ifdef HAVE_GTK - fg_fb = acons (list1 (Qgtk), build_ascstring ("black"), fg_fb); - bg_fb = acons (list1 (Qgtk), build_ascstring ("white"), bg_fb); + fg_fb = Facons (list1 (Qgtk), build_ascstring ("black"), fg_fb); + bg_fb = Facons (list1 (Qgtk), build_ascstring ("white"), bg_fb); #endif #ifdef HAVE_X_WINDOWS - fg_fb = acons (list1 (Qx), build_ascstring ("black"), fg_fb); - bg_fb = acons (list1 (Qx), build_ascstring ("gray80"), bg_fb); + fg_fb = Facons (list1 (Qx), build_ascstring ("black"), fg_fb); + bg_fb = Facons (list1 (Qx), build_ascstring ("gray80"), bg_fb); #endif #ifdef HAVE_TTY - fg_fb = acons (list1 (Qtty), Fvector (0, 0), fg_fb); - bg_fb = acons (list1 (Qtty), Fvector (0, 0), bg_fb); + fg_fb = Facons (list1 (Qtty), Fvector (0, 0), fg_fb); + bg_fb = Facons (list1 (Qtty), Fvector (0, 0), bg_fb); #endif #ifdef HAVE_MS_WINDOWS - fg_fb = acons (list1 (Qmsprinter), build_ascstring ("black"), fg_fb); - bg_fb = acons (list1 (Qmsprinter), build_ascstring ("white"), bg_fb); - fg_fb = acons (list1 (Qmswindows), build_ascstring ("black"), fg_fb); - bg_fb = acons (list1 (Qmswindows), build_ascstring ("white"), bg_fb); + fg_fb = Facons (list1 (Qmsprinter), build_ascstring ("black"), fg_fb); + bg_fb = Facons (list1 (Qmsprinter), build_ascstring ("white"), bg_fb); + fg_fb = Facons (list1 (Qmswindows), build_ascstring ("black"), fg_fb); + bg_fb = Facons (list1 (Qmswindows), build_ascstring ("white"), bg_fb); #endif set_specifier_fallback (Fget (Vdefault_face, Qforeground, Qnil), fg_fb); set_specifier_fallback (Fget (Vdefault_face, Qbackground, Qnil), bg_fb); @@ -2519,22 +2519,22 @@ /* We need to put something in there, or error checking gets #%!@#ed up before the styles are set, which override the fallbacks. */ - fg_fb = acons (list1 (Qgtk), build_ascstring ("black"), fg_fb); - bg_fb = acons (list1 (Qgtk), build_ascstring ("Gray80"), bg_fb); + fg_fb = Facons (list1 (Qgtk), build_ascstring ("black"), fg_fb); + bg_fb = Facons (list1 (Qgtk), build_ascstring ("Gray80"), bg_fb); #endif #ifdef HAVE_X_WINDOWS - fg_fb = acons (list1 (Qx), build_ascstring ("black"), fg_fb); - bg_fb = acons (list1 (Qx), build_ascstring ("Gray80"), bg_fb); + fg_fb = Facons (list1 (Qx), build_ascstring ("black"), fg_fb); + bg_fb = Facons (list1 (Qx), build_ascstring ("Gray80"), bg_fb); #endif #ifdef HAVE_TTY - fg_fb = acons (list1 (Qtty), Fvector (0, 0), fg_fb); - bg_fb = acons (list1 (Qtty), Fvector (0, 0), bg_fb); + fg_fb = Facons (list1 (Qtty), Fvector (0, 0), fg_fb); + bg_fb = Facons (list1 (Qtty), Fvector (0, 0), bg_fb); #endif #ifdef HAVE_MS_WINDOWS - fg_fb = acons (list1 (Qmsprinter), build_ascstring ("black"), fg_fb); - bg_fb = acons (list1 (Qmsprinter), build_ascstring ("white"), bg_fb); - fg_fb = acons (list1 (Qmswindows), build_ascstring ("black"), fg_fb); - bg_fb = acons (list1 (Qmswindows), build_ascstring ("Gray75"), bg_fb); + fg_fb = Facons (list1 (Qmsprinter), build_ascstring ("black"), fg_fb); + bg_fb = Facons (list1 (Qmsprinter), build_ascstring ("white"), bg_fb); + fg_fb = Facons (list1 (Qmswindows), build_ascstring ("black"), fg_fb); + bg_fb = Facons (list1 (Qmswindows), build_ascstring ("Gray75"), bg_fb); #endif set_specifier_fallback (Fget (Vgui_element_face, Qforeground, Qnil), fg_fb); set_specifier_fallback (Fget (Vgui_element_face, Qbackground, Qnil), bg_fb);