*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index bec719220b576acc571b9e0cec2a7d10dc20f489..e3ec0d857066d4e7710f9f0dca0156cd193cfb93 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2983,7 +2983,8 @@ bitmap of the display line.
 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 --git a/lispref/ChangeLog b/lispref/ChangeLog
index bc49eb9f6526731a63985a7b4841aac30cc0b4fe..268304e5d4ca2956f35cb28e9e40f32e38249c0e 100644 (file)
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -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