Mercurial > hg > xemacs-beta

comparison src/faces.c @ 5133:444a448b2f53

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
5113:b2dcf6a6d8ab 5133:444a448b2f53
312 { XD_LISP_OBJECT, offsetof (Lisp_Face, plist) }, 312 { XD_LISP_OBJECT, offsetof (Lisp_Face, plist) },
313 { XD_LISP_OBJECT, offsetof (Lisp_Face, charsets_warned_about) }, 313 { XD_LISP_OBJECT, offsetof (Lisp_Face, charsets_warned_about) },
314 { XD_END } 314 { XD_END }
315 }; 315 };
316 316
317 DEFINE_LRECORD_IMPLEMENTATION_WITH_PROPS ("face", face, 317 DEFINE_DUMPABLE_GENERAL_LISP_OBJECT ("face", face,
318 1, /*dumpable-flag*/ 318 mark_face, print_face, 0, face_equal,
319 mark_face, print_face, 0, face_equal, 319 face_hash, face_description,
320 face_hash, face_description, 320 face_getprop,
321 face_getprop, 321 face_putprop, face_remprop,
322 face_putprop, face_remprop, 322 face_plist, 0 /* no disksaver */,
323 face_plist, Lisp_Face); 323 Lisp_Face);
324 324
325 /************************************************************************/ 325 /************************************************************************/
326 /* face read syntax */ 326 /* face read syntax */
327 /************************************************************************/ 327 /************************************************************************/
328 328
408 } 408 }
409 409
410 static Lisp_Face * 410 static Lisp_Face *
411 allocate_face (void) 411 allocate_face (void)
412 { 412 {
413 Lisp_Face *result = ALLOC_LCRECORD_TYPE (Lisp_Face, &lrecord_face); 413 Lisp_Object obj = ALLOC_NORMAL_LISP_OBJECT (face);
414 Lisp_Face *result = XFACE (obj);
414 415
415 reset_face (result); 416 reset_face (result);
416 return result; 417 return result;
417 } 418 }
418 419
2111 2112
2112 2113
2113 void 2114 void
2114 syms_of_faces (void) 2115 syms_of_faces (void)
2115 { 2116 {
2116 INIT_LRECORD_IMPLEMENTATION (face); 2117 INIT_LISP_OBJECT (face);
2117 2118
2118 /* Qdefault, Qwidget, Qleft_margin, Qright_margin defined in general.c */ 2119 /* Qdefault, Qwidget, Qleft_margin, Qright_margin defined in general.c */
2119 DEFSYMBOL (Qmodeline); 2120 DEFSYMBOL (Qmodeline);
2120 DEFSYMBOL (Qgui_element); 2121 DEFSYMBOL (Qgui_element);
2121 DEFSYMBOL (Qtext_cursor); 2122 DEFSYMBOL (Qtext_cursor);