# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1132500151 0
# Node ID 095993a59ddda3beb2ae957f5723bf7cf3812917
# Parent  0425305d73a5f94afac51fea2ae2f901d4e50a87
	* xfaces.c (Finternal_set_lisp_face_attribute): Use
	:ignore-defface for new frame defaults when `unspecified' is
	supplied.
	(Finternal_get_lisp_face_attribute): Hide :ignore-defface.

diff -r 0425305d73a5 -r 095993a59ddd src/ChangeLog
--- a/src/ChangeLog	Sun Nov 20 15:17:23 2005 +0000
+++ b/src/ChangeLog	Sun Nov 20 15:22:31 2005 +0000
@@ -1,3 +1,10 @@
+2005-11-20  Chong Yidong  <cyd@stupidchicken.com>
+
+	* xfaces.c (Finternal_set_lisp_face_attribute): Use
+	:ignore-defface for new frame defaults when `unspecified' is
+	supplied.
+	(Finternal_get_lisp_face_attribute): Hide :ignore-defface.
+
 2005-11-20  Juri Linkov  <juri@jurta.org>
 
 	* charset.c (invalid_character): Use Lisp-readable syntax
diff -r 0425305d73a5 -r 095993a59ddd src/xfaces.c
--- a/src/xfaces.c	Sun Nov 20 15:17:23 2005 +0000
+++ b/src/xfaces.c	Sun Nov 20 15:22:31 2005 +0000
@@ -4054,7 +4054,11 @@
 
   /* Set lface to the Lisp attribute vector of FACE.  */
   if (EQ (frame, Qt))
-    lface = lface_from_face_name (NULL, face, 1);
+    {
+      lface = lface_from_face_name (NULL, face, 1);
+      if (UNSPECIFIEDP (value))
+	value = Qignore_defface;
+    }
   else
     {
       if (NILP (frame))
@@ -4880,6 +4884,9 @@
   else
     signal_error ("Invalid face attribute name", keyword);
 
+  if (IGNORE_DEFFACE_P (value))
+    return Qunspecified;
+
   return value;
 }