Mercurial > hg > xemacs-beta
diff src/faces.c @ 5133:444a448b2f53
Merge branch ben-lisp-object into default branch
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sun, 07 Mar 2010 06:47:37 -0600 |
| parents | 7be849cb8828 |
| children | 1fae11d56ad2 |
line wrap: on
line diff
--- a/src/faces.c Sun Mar 07 06:43:19 2010 -0600 +++ b/src/faces.c Sun Mar 07 06:47:37 2010 -0600 @@ -314,13 +314,13 @@ { XD_END } }; -DEFINE_LRECORD_IMPLEMENTATION_WITH_PROPS ("face", face, - 1, /*dumpable-flag*/ - mark_face, print_face, 0, face_equal, - face_hash, face_description, - face_getprop, - face_putprop, face_remprop, - face_plist, Lisp_Face); +DEFINE_DUMPABLE_GENERAL_LISP_OBJECT ("face", face, + mark_face, print_face, 0, face_equal, + face_hash, face_description, + face_getprop, + face_putprop, face_remprop, + face_plist, 0 /* no disksaver */, + Lisp_Face); /************************************************************************/ /* face read syntax */ @@ -410,7 +410,8 @@ static Lisp_Face * allocate_face (void) { - Lisp_Face *result = ALLOC_LCRECORD_TYPE (Lisp_Face, &lrecord_face); + Lisp_Object obj = ALLOC_NORMAL_LISP_OBJECT (face); + Lisp_Face *result = XFACE (obj); reset_face (result); return result; @@ -2113,7 +2114,7 @@ void syms_of_faces (void) { - INIT_LRECORD_IMPLEMENTATION (face); + INIT_LISP_OBJECT (face); /* Qdefault, Qwidget, Qleft_margin, Qright_margin defined in general.c */ DEFSYMBOL (Qmodeline);