Mercurial > hg > xemacs-beta

comparison src/faces.c @ 185:3d6bfa290dbd r20-3b19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-3b19
author cvs
date Mon, 13 Aug 2007 09:55:28 +0200
parents e121b013d1f0
children a2f645c6b9f8
comparison
equal deleted inserted replaced
184:bcd2674570bf 185:3d6bfa290dbd
381 381
382 static struct Lisp_Face * 382 static struct Lisp_Face *
383 allocate_face (void) 383 allocate_face (void)
384 { 384 {
385 struct Lisp_Face *result = 385 struct Lisp_Face *result =
386 alloc_lcrecord (sizeof (struct Lisp_Face), lrecord_face); 386 alloc_lcrecord_type (struct Lisp_Face, lrecord_face);
387 387
388 reset_face (result); 388 reset_face (result);
389 return result; 389 return result;
390 } 390 }
391 391
403 void *face_list_closure) 403 void *face_list_closure)
404 { 404 {
405 /* This function can GC */ 405 /* This function can GC */
406 Lisp_Object key, contents; 406 Lisp_Object key, contents;
407 Lisp_Object *face_list; 407 Lisp_Object *face_list;
408 struct face_list_closure *fcl = face_list_closure; 408 struct face_list_closure *fcl =
409 (struct face_list_closure *) face_list_closure;
409 CVOID_TO_LISP (key, hash_key); 410 CVOID_TO_LISP (key, hash_key);
410 VOID_TO_LISP (contents, hash_contents); 411 VOID_TO_LISP (contents, hash_contents);
411 face_list = fcl->face_list; 412 face_list = fcl->face_list;
412 413
413 *face_list = Fcons (XFACE (contents)->name, *face_list); 414 *face_list = Fcons (XFACE (contents)->name, *face_list);
509 static void 510 static void
510 update_face_inheritance_mapper (CONST void *hash_key, void *hash_contents, 511 update_face_inheritance_mapper (CONST void *hash_key, void *hash_contents,
511 void *face_inheritance_closure) 512 void *face_inheritance_closure)
512 { 513 {
513 Lisp_Object key, contents; 514 Lisp_Object key, contents;
514 struct face_inheritance_closure *fcl = face_inheritance_closure; 515 struct face_inheritance_closure *fcl =
516 (struct face_inheritance_closure *) face_inheritance_closure;
515 517
516 CVOID_TO_LISP (key, hash_key); 518 CVOID_TO_LISP (key, hash_key);
517 VOID_TO_LISP (contents, hash_contents); 519 VOID_TO_LISP (contents, hash_contents);
518 520
519 if (EQ (fcl->property, Qfont)) 521 if (EQ (fcl->property, Qfont))