Mercurial > emacs
changeset 59455:e024e6716c4a
*** empty log message ***
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Mon, 10 Jan 2005 13:29:50 +0000 |
| parents | 9007a66f8c7a |
| children | 08a75ace96a6 |
| files | src/ChangeLog |
| diffstat | 1 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Jan 10 11:56:07 2005 +0000 +++ b/src/ChangeLog Mon Jan 10 13:29:50 2005 +0000 @@ -1,3 +1,15 @@ +2005-01-10 Kim F. Storm <storm@cua.dk> + + * dispextern.h (merge_faces): Rename from merge_into_realized_face. + + * xfaces.c (merge_faces): Rename from merge_into_realized_face. + Callers changed. + Add support to merge with lisp face id too (if face_name is t). + + * xdisp.c (get_next_display_element, next_element_from_display_vector): + Don't lookup lface_id from display table glyphs here; instead use + merge_faces to merge the lisp face id into current face. + 2005-01-09 Kim F. Storm <storm@cua.dk> * dispextern.h (struct it): New member dpvec_face_id.