# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 976122905 0
# Node ID 2271500f483eb887f86cb5d0b94e7d8ef9fe86f3
# Parent  2f5e050486ce3c1e5892f29ecafe618c3b64bbe0
*** empty log message ***

diff -r 2f5e050486ce -r 2271500f483e lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Dec 06 17:14:38 2000 +0000
+++ b/lisp/ChangeLog	Wed Dec 06 17:15:05 2000 +0000
@@ -15,6 +15,9 @@
 
 2000-12-06  Gerd Moellmann  <gerd@gnu.org>
 
+	* replace.el (occur): Make line-number-width 1 smaller for the
+	colon following the line number.
+
 	* startup.el (fancy-splash-text, command-line-1): Use
 	`File' for the menu name instead of `Files'.
 	
diff -r 2f5e050486ce -r 2271500f483e src/ChangeLog
--- a/src/ChangeLog	Wed Dec 06 17:14:38 2000 +0000
+++ b/src/ChangeLog	Wed Dec 06 17:15:05 2000 +0000
@@ -10,6 +10,13 @@
 
 2000-12-06  Gerd Moellmann  <gerd@gnu.org>
 
+	* xdisp.c (underlying_face_id): New function.
+	(handle_face_prop, face_before_or_after_it_pos): Use it
+	to determine the face ``under'' a string.  Let strings inherit
+	the face of the buffer under them.
+
+	* xfaces.c (face_at_string_position): Update function comment.
+	
 	* dispnew.c (adjust_glyph_matrix): Don't reuse a window's current
 	matrix if the window's left position has changed; we need to
 	redraw it in this case.