Mercurial > emacs
changeset 66983:79256abc393d
(Fface_attribute_relative_p, Fmerge_face_attribute): Handle
Qignore_defface as a possible value.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Fri, 18 Nov 2005 03:55:45 +0000 |
| parents | 99199f06f44c |
| children | 9d0a2cc054be |
| files | src/ChangeLog src/xfaces.c |
| diffstat | 2 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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'.
--- 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);