[Emacs-diffs] trunk r114814: Doc fix for set-fringe-bitmap-face.

[Xue Fuqiao]

------------------------------------------------------------
revno: 114814
revision-id: address@hidden
parent: address@hidden
committer: Xue Fuqiao <address@hidden>
branch nick: trunk
timestamp: Sat 2013-10-26 11:13:18 +0800
message:
  Doc fix for set-fringe-bitmap-face.
  
  * src/fringe.c (set_fringe_bitmap_face): Add usage note from lispref.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/fringe.c                   fringe.c-20091113204419-o5vbwnq5f7feedwu-2965

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-10-25 09:52:37 +0000
+++ b/src/ChangeLog     2013-10-26 03:13:18 +0000
@@ -1,3 +1,7 @@
+2013-10-26  Xue Fuqiao  <address@hidden>
+
+       * fringe.c (set_fringe_bitmap_face): Add usage note from lispref.
+
 2013-10-25  Eli Zaretskii  <address@hidden>
 
        * w32uniscribe.c (uniscribe_close): Adjust the argument list to

=== modified file 'src/fringe.c'
--- a/src/fringe.c      2013-10-04 07:36:22 +0000
+++ b/src/fringe.c      2013-10-26 03:13:18 +0000
@@ -1690,6 +1690,8 @@
 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)
 {