# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1111618045 0
# Node ID 7c3adf6878123ec909b4ec7b6058bba4df297627
# Parent  bd91e3eed2ff0903358effa89076d1c87136afc3
*** empty log message ***

diff -r bd91e3eed2ff -r 7c3adf687812 etc/NEWS
--- a/etc/NEWS	Wed Mar 23 22:34:40 2005 +0000
+++ b/etc/NEWS	Wed Mar 23 22:47:25 2005 +0000
@@ -2983,7 +2983,8 @@
 Format is 'display '(left-fringe BITMAP [FACE]), where BITMAP is a
 symbol identifying a fringe bitmap, either built-in or defined with
 `define-fringe-bitmap', and FACE is an optional face name to be used
-for displaying the bitmap.
+for displaying the bitmap instead of the default `fringe' face.
+When specified, FACE is automatically merged with the `fringe' face.
 
 *** New function `fringe-bitmaps-at-pos' returns the current fringe
 bitmaps in the display line at a given buffer position.
diff -r bd91e3eed2ff -r 7c3adf687812 lispref/ChangeLog
--- a/lispref/ChangeLog	Wed Mar 23 22:34:40 2005 +0000
+++ b/lispref/ChangeLog	Wed Mar 23 22:47:25 2005 +0000
@@ -1,3 +1,11 @@
+2005-03-23  Kim F. Storm  <storm@cua.dk>
+
+	* display.texi (Standard Faces): Other faces used in the fringe
+	implicitly inherits from the fringe face.
+	(Fringe Bitmaps): FACE in right-fringe and left-fringe display
+	properties implicitly inherits from fringe face.
+	(Customizing Bitmaps): Likewise for set-fringe-bitmap-face.
+
 2005-03-20  Chong Yidong  <cyd@stupidchicken.com>
 
 	* display.texi (Invisible Text): State default value of