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

[Chong Yidong]

Index: emacs/src/ChangeLog
diff -c emacs/src/ChangeLog:1.4722 emacs/src/ChangeLog:1.4723
*** emacs/src/ChangeLog:1.4722  Fri Nov 18 01:48:39 2005
--- emacs/src/ChangeLog Fri Nov 18 03:55:45 2005
***************
*** 3,11 ****
        * 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'.
  
--- 3,12 ----
        * xfaces.c (Qignore_defface): New variable.
        (syms_of_xfaces): Provide `:ignore-defface'.
        (IGNORE_DEFFACE_P): New macro.
!       (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'.