# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1132286145 0
# Node ID 79256abc393d407070b23cf539c18e7092ef7d2a
# Parent  99199f06f44cd927f0ed60be546c94dfab10e1dd
	(Fface_attribute_relative_p, Fmerge_face_attribute): Handle
	Qignore_defface as a possible value.

diff -r 99199f06f44c -r 79256abc393d src/ChangeLog
--- a/src/ChangeLog	Fri Nov 18 03:06:20 2005 +0000
+++ b/src/ChangeLog	Fri Nov 18 03:55:45 2005 +0000
@@ -3,9 +3,10 @@
 	* xfaces.c (Qignore_defface): New variable.
 	(syms_of_xfaces): Provide `:ignore-defface'.
 	(IGNORE_DEFFACE_P): New macro.
-	(check_lface_attrs): Qignore_defface is a possible value.
-	(lface_fully_specified_p): Likewise.
-	(Finternal_set_lisp_face_attribute): Likewise.
+	(check_lface_attrs, lface_fully_specified_p)
+	(Finternal_set_lisp_face_attribute)
+	(Fface_attribute_relative_p, Fmerge_face_attribute): Handle
+	Qignore_defface as a possible value.
 	(merge_face_vectors): The merged face is `unspecified' if the
 	mergee specifies `:ignore-defface'.
 
diff -r 99199f06f44c -r 79256abc393d src/xfaces.c
--- a/src/xfaces.c	Fri Nov 18 03:06:20 2005 +0000
+++ b/src/xfaces.c	Fri Nov 18 03:55:45 2005 +0000
@@ -4794,7 +4794,7 @@
      (attribute, value)
      Lisp_Object attribute, value;
 {
-  if (EQ (value, Qunspecified))
+  if (EQ (value, Qunspecified) || (EQ (value, Qignore_defface)))
     return Qt;
   else if (EQ (attribute, QCheight))
     return INTEGERP (value) ? Qnil : Qt;
@@ -4810,7 +4810,7 @@
      (attribute, value1, value2)
      Lisp_Object attribute, value1, value2;
 {
-  if (EQ (value1, Qunspecified))
+  if (EQ (value1, Qunspecified) || EQ (value1, Qignore_defface))
     return value2;
   else if (EQ (attribute, QCheight))
     return merge_face_heights (value1, value2, value1);