[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/ChangeLog
From: |
Kim F . Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/ChangeLog |
Date: |
Mon, 10 Jan 2005 08:44:25 -0500 |
Index: emacs/src/ChangeLog
diff -c emacs/src/ChangeLog:1.4146 emacs/src/ChangeLog:1.4147
*** emacs/src/ChangeLog:1.4146 Sun Jan 9 02:03:50 2005
--- emacs/src/ChangeLog Mon Jan 10 13:29:50 2005
***************
*** 1,3 ****
--- 1,15 ----
+ 2005-01-10 Kim F. Storm <address@hidden>
+
+ * 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 <address@hidden>
* dispextern.h (struct it): New member dpvec_face_id.
- [Emacs-diffs] Changes to emacs/src/ChangeLog, (continued)
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Richard M . Stallman, 2005/01/04
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Kenichi Handa, 2005/01/05
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Steven Tamm, 2005/01/05
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Kim F . Storm, 2005/01/06
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Steven Tamm, 2005/01/07
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Kim F . Storm, 2005/01/07
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Jan Djärv, 2005/01/07
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Jan Djärv, 2005/01/07
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Jan Djärv, 2005/01/08
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Kim F . Storm, 2005/01/08
- [Emacs-diffs] Changes to emacs/src/ChangeLog,
Kim F . Storm <=
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Richard M . Stallman, 2005/01/12
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Kim F . Storm, 2005/01/13
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Richard M . Stallman, 2005/01/21
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Kim F . Storm, 2005/01/21
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Steven Tamm, 2005/01/22
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Kim F . Storm, 2005/01/22
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Kim F . Storm, 2005/01/22
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Kim F . Storm, 2005/01/23
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Kim F . Storm, 2005/01/23
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Kim F . Storm, 2005/01/24