diff options
| author | Chong Yidong | 2005-11-18 03:55:45 +0000 |
|---|---|---|
| committer | Chong Yidong | 2005-11-18 03:55:45 +0000 |
| commit | 05338727a874606f2daa6e4d78fe871586aeffde (patch) | |
| tree | 8157a8e20324019dc704cc56205942b7835c823b /src/ChangeLog | |
| parent | 4bfd45248daa0589c97b76fd5d9d0483de1aaec3 (diff) | |
| download | emacs-05338727a874606f2daa6e4d78fe871586aeffde.tar.gz emacs-05338727a874606f2daa6e4d78fe871586aeffde.zip | |
(Fface_attribute_relative_p, Fmerge_face_attribute): Handle
Qignore_defface as a possible value.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index dcdc481f37b..078164c5fb9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -3,9 +3,10 @@ | |||
| 3 | * xfaces.c (Qignore_defface): New variable. | 3 | * xfaces.c (Qignore_defface): New variable. |
| 4 | (syms_of_xfaces): Provide `:ignore-defface'. | 4 | (syms_of_xfaces): Provide `:ignore-defface'. |
| 5 | (IGNORE_DEFFACE_P): New macro. | 5 | (IGNORE_DEFFACE_P): New macro. |
| 6 | (check_lface_attrs): Qignore_defface is a possible value. | 6 | (check_lface_attrs, lface_fully_specified_p) |
| 7 | (lface_fully_specified_p): Likewise. | 7 | (Finternal_set_lisp_face_attribute) |
| 8 | (Finternal_set_lisp_face_attribute): Likewise. | 8 | (Fface_attribute_relative_p, Fmerge_face_attribute): Handle |
| 9 | Qignore_defface as a possible value. | ||
| 9 | (merge_face_vectors): The merged face is `unspecified' if the | 10 | (merge_face_vectors): The merged face is `unspecified' if the |
| 10 | mergee specifies `:ignore-defface'. | 11 | mergee specifies `:ignore-defface'. |
| 11 | 12 | ||