Mercurial > emacs

diff src/ChangeLog @ 31222:50b63dd65faf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Miles Bader <miles@gnu.org>
date Mon, 28 Aug 2000 14:42:49 +0000
parents 6e4b811a1f3e
children 0c280e986946
line wrap: on
line diff
--- a/src/ChangeLog	Mon Aug 28 14:41:55 2000 +0000
+++ b/src/ChangeLog	Mon Aug 28 14:42:49 2000 +0000
@@ -1,3 +1,9 @@
+2000-08-28  Miles Bader  <miles@gnu.org>
+
+	* xfaces.c (merge_face_vectors): Clear TO's :font attribute if
+	made inconsistent by a font-related attribute in FROM.
+	(merge_face_inheritance): Add function comment.
+
 2000-08-28  Kenichi Handa  <handa@etl.go.jp>
 
 	* keyboard.c (read_char_minibuf_menu_prompt): Call read_char with