Doc fix for set-fringe-bitmap-face.

* src/fringe.c (set_fringe_bitmap_face): Add usage note from lispref.

diff --git a/src/ChangeLog b/src/ChangeLog
index 52c025ad7aae75c05a8791a2b35f2e689e9b5907..f625044067dd425bf591c49144f9c88bc35f0625 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-26  Xue Fuqiao  <xfq.free@gmail.com>
+
+       * fringe.c (set_fringe_bitmap_face): Add usage note from lispref.
+
 2013-10-25  Eli Zaretskii  <eliz@gnu.org>
 
        * w32uniscribe.c (uniscribe_close): Adjust the argument list to

diff --git a/src/fringe.c b/src/fringe.c
index 3537027f1ddbc6ce3ce7c0a4d8f643a9cbffd8c6..9c77e6557f4a8d1892652a13211a66e86c477c8d 100644 (file)
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1690,6 +1690,8 @@ If BITMAP already exists, the existing definition is replaced.  */)
 DEFUN ("set-fringe-bitmap-face", Fset_fringe_bitmap_face, Sset_fringe_bitmap_face,
        1, 2, 0,
        doc: /* Set face for fringe bitmap BITMAP to FACE.
+FACE is merged with the `fringe' face, so normally FACE should specify
+only the foreground color.
 If FACE is nil, reset face to default fringe face.  */)
   (Lisp_Object bitmap, Lisp_Object face)
 {