[Emacs-diffs] Changes to emacs/src/ChangeLog

[Chong Yidong]

Index: emacs/src/ChangeLog
diff -c emacs/src/ChangeLog:1.4721 emacs/src/ChangeLog:1.4722
*** emacs/src/ChangeLog:1.4721  Wed Nov 16 18:39:00 2005
--- emacs/src/ChangeLog Fri Nov 18 01:48:39 2005
***************
*** 1,3 ****
--- 1,14 ----
+ 2005-11-17  Chong Yidong  <address@hidden>
+ 
+       * 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  <address@hidden>
  
        * lread.c (readevalloop): Add missing GCPROs.