Mercurial > emacs
changeset 31180:50e64e820eb6
*** empty log message ***
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sat, 26 Aug 2000 05:53:18 +0000 |
| parents | 354c781f2864 |
| children | 8a9141681d6a |
| files | lisp/ChangeLog src/ChangeLog |
| diffstat | 2 files changed, 29 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Aug 26 05:51:52 2000 +0000 +++ b/lisp/ChangeLog Sat Aug 26 05:53:18 2000 +0000 @@ -1,3 +1,7 @@ +2000-08-26 Miles Bader <miles@gnu.org> + + * faces.el (describe-face): Add support for :inherit attribute. + 2000-08-25 Kenichi Handa <handa@etl.go.jp> * terminal.el (terminal-emulator): Fix args to `concat'. Now
--- a/src/ChangeLog Sat Aug 26 05:51:52 2000 +0000 +++ b/src/ChangeLog Sat Aug 26 05:53:18 2000 +0000 @@ -1,3 +1,28 @@ +2000-08-26 Miles Bader <miles@gnu.org> + + * dispextern.h (enum lface_attribute_index): Add LFACE_INHERIT_INDEX. + * xfaces.c (QCinherit): New variable. + (syms_of_xfaces): Initialize it. + (LFACE_INHERIT): New macro. + (Finternal_get_lisp_face_attribute) + (merge_face_vector_with_property) + (Finternal_set_lisp_face_attribute): Deal with :inherit attribute. + (check_lface_attrs): Allow new types of face height. Check + inherit attribute. + (CYCLE_CHECK): New macro. + (merge_face_inheritance): New function. + (merge_face_vectors): Merge inherited faces too. Add F and + CYCLE_CHECK arguments. + (merge_face_vector_with_property, Finternal_merge_in_global_face) + (lookup_named_face, lookup_derived_face, realize_named_face) + (face_at_string_position, face_at_buffer_position): Supply + new F and CYCLE_CHECK arguments to merge_face_vectors. + (merge_face_heights): New function. + (merge_face_vectors, merge_face_vector_with_property) + (Finternal_set_lisp_face_attribute): Call merge_face_heights to + handle relative face heights. + (lface_same_font_attributes_p): Compare heights using EQ. + 2000-08-26 Kenichi Handa <handa@etl.go.jp> * charset.c (char_to_string): Check the character validity.