summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorXue Fuqiao <xfq.free@gmail.com>2013-10-26 11:13:18 +0800
committerXue Fuqiao <xfq.free@gmail.com>2013-10-26 11:13:18 +0800
commit2a03e2bc6fcc64b2624a9635c899812e4510136a (patch)
tree4b9508226a043252cb2d35fa05968bcf914614be /src
parent918a7ad426e75acc0d38d87c2900ec6ba9a52bf3 (diff)
downloademacs-2a03e2bc6fcc64b2624a9635c899812e4510136a.tar.gz
Doc fix for set-fringe-bitmap-face.
* src/fringe.c (set_fringe_bitmap_face): Add usage note from lispref.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/fringe.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 52c025ad7aa..f625044067d 100644
--- 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 3537027f1dd..9c77e6557f4 100644
--- 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)
{