mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-31 17:30:54 -08:00
Code Issues Projects Releases Wiki Activity

*** empty log message ***

Browse source
This commit is contained in:
Kim F. Storm 2005-01-10 13:29:50 +00:00
parent e4edc5cd31
commit 57a230b140
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/ChangeLog
View file

@ -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.