1 files changed, 11 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 900db33db3d..dcdc481f37b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2005-11-17  Chong Yidong  <cyd@stupidchicken.com>
+
+        * 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.
+        (merge_face_vectors): The merged face is `unspecified' if the
+        mergee specifies `:ignore-defface'.
+
 2005-11-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * lread.c (readevalloop): Add missing GCPROs.