From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 6 Dec 2000 17:15:05 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.93~147
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=384333ee0f2fb2b84771ee7f62bbac97247164c1;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3cee6c6ee49..079ecdb1def 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index eaab29fd0a1..18459e55a58 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.