diff 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
line wrap: on
line diff
--- a/src/faces.c	Mon Aug 13 10:10:03 2007 +0200
+++ b/src/faces.c	Mon Aug 13 10:10:54 2007 +0200
@@ -319,15 +319,7 @@
       valw = Fcar (data);
       data = Fcdr (data);
       if (EQ (keyw, Qname))
-	{
-	  if (name_seen)
-	    {
-	      maybe_signal_simple_error ("Duplicate face name given", valw,
-					 Qface, errb);
-	      return 0;
-	    }
-	  name_seen = 1;
-	}
+	name_seen = 1;
       else
 	abort ();
     }
@@ -467,6 +459,8 @@
   mark_all_faces_internal (0);
 }
 
+/* Currently unused (see the comment in face_property_was_changed()).  */
+#if 0
 /* #### OBSOLETE ME, PLEASE.  Maybe.  Maybe this is just as good as
    any other solution. */
 struct face_inheritance_closure
@@ -561,6 +555,7 @@
 
   UNGCPRO;
 }
+#endif /* 0 */
 
 Lisp_Object
 face_property_matching_instance (Lisp_Object face, Lisp_Object property,