Mercurial > emacs

diff src/ChangeLog @ 55966:b9f354f2c61f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381 Face merging cleanups The only user-visible changes should be: * The priority order of faces in a face :inherit attribute is now reversed (for consistency with face lists in `face' text properties) * An :inherit loop is halted immediately, instead of being applied several times first; this should only matters when a relative attribute such as a :height scale is used.
author Miles Bader <miles@gnu.org>
date Mon, 07 Jun 2004 07:02:20 +0000
parents a98219d0f4e4
children bbba5d83d7d3
line wrap: on
line diff
--- a/src/ChangeLog	Mon Jun 07 00:00:03 2004 +0000
+++ b/src/ChangeLog	Mon Jun 07 07:02:20 2004 +0000
@@ -1,3 +1,23 @@
+2004-06-07  Miles Bader  <miles@gnu.org>
+
+	* (struct named_merge_point): New type.
+	(push_named_merge_point): New function.
+	(merge_named_face): New function.
+	(merge_face_ref, face_at_buffer_position, face_at_string_position):
+	Use `merge_named_face'.
+	(merge_face_inheritance): Function removed.
+	(merge_face_ref): Renamed from `merge_face_vector_with_property'.
+	Add new `err_msgs' and `named_merge_points' args.  Return error
+	status.  Only print error messages if ERR_MSGS is true.  Don't try to
+	do :inherit attribute validation.
+	(merge_face_heights): Handle `unspecified' in both directions.
+	(merge_face_vectors): Rename `cycle_check' arg to `named_merge_points'.
+	Call `merge_face_ref' instead of `merge_face_inheritance'.
+	(Fdisplay_supports_face_attributes_p, Fface_attributes_as_vector)
+	(compute_char_face, face_at_buffer_position)
+	(face_at_string_position): Call `merge_face_ref' instead of
+	`merge_face_vector_with_property'.
+
 2004-06-07  Kenichi Handa  <handa@m17n.org>
 
 	* coding.c (find_safe_codings): Check NILP (safe_codings) only at