comparison src/faces.c @ 223:2c611d1463a6 r20-4b10

Import from CVS: tag r20-4b10
author cvs
date Mon, 13 Aug 2007 10:10:54 +0200
parents 262b8bb4a523
children f955c73f5258
comparison
equal deleted inserted replaced
222:aae4c8b01452 223:2c611d1463a6
317 317
318 data = Fcdr (data); 318 data = Fcdr (data);
319 valw = Fcar (data); 319 valw = Fcar (data);
320 data = Fcdr (data); 320 data = Fcdr (data);
321 if (EQ (keyw, Qname)) 321 if (EQ (keyw, Qname))
322 { 322 name_seen = 1;
323 if (name_seen)
324 {
325 maybe_signal_simple_error ("Duplicate face name given", valw,
326 Qface, errb);
327 return 0;
328 }
329 name_seen = 1;
330 }
331 else 323 else
332 abort (); 324 abort ();
333 } 325 }
334 326
335 if (!name_seen) 327 if (!name_seen)
465 mark_all_faces_as_clean (void) 457 mark_all_faces_as_clean (void)
466 { 458 {
467 mark_all_faces_internal (0); 459 mark_all_faces_internal (0);
468 } 460 }
469 461
462 /* Currently unused (see the comment in face_property_was_changed()). */
463 #if 0
470 /* #### OBSOLETE ME, PLEASE. Maybe. Maybe this is just as good as 464 /* #### OBSOLETE ME, PLEASE. Maybe. Maybe this is just as good as
471 any other solution. */ 465 any other solution. */
472 struct face_inheritance_closure 466 struct face_inheritance_closure
473 { 467 {
474 Lisp_Object face; 468 Lisp_Object face;
559 elisp_maphash (update_face_inheritance_mapper, Vtemporary_faces_cache, 553 elisp_maphash (update_face_inheritance_mapper, Vtemporary_faces_cache,
560 &face_inheritance_closure); 554 &face_inheritance_closure);
561 555
562 UNGCPRO; 556 UNGCPRO;
563 } 557 }
558 #endif /* 0 */
564 559
565 Lisp_Object 560 Lisp_Object
566 face_property_matching_instance (Lisp_Object face, Lisp_Object property, 561 face_property_matching_instance (Lisp_Object face, Lisp_Object property,
567 Lisp_Object charset, Lisp_Object domain, 562 Lisp_Object charset, Lisp_Object domain,
568 Error_behavior errb, int no_fallback, 563 Error_behavior errb, int no_fallback,