diff options
| author | Xue Fuqiao | 2013-10-26 11:13:18 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-10-26 11:13:18 +0800 |
| commit | 2a03e2bc6fcc64b2624a9635c899812e4510136a (patch) | |
| tree | 4b9508226a043252cb2d35fa05968bcf914614be /src | |
| parent | 918a7ad426e75acc0d38d87c2900ec6ba9a52bf3 (diff) | |
| download | emacs-2a03e2bc6fcc64b2624a9635c899812e4510136a.tar.gz emacs-2a03e2bc6fcc64b2624a9635c899812e4510136a.zip | |
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/ChangeLog | 4 | ||||
| -rw-r--r-- | src/fringe.c | 2 |
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 @@ | |||
| 1 | 2013-10-26 Xue Fuqiao <xfq.free@gmail.com> | ||
| 2 | |||
| 3 | * fringe.c (set_fringe_bitmap_face): Add usage note from lispref. | ||
| 4 | |||
| 1 | 2013-10-25 Eli Zaretskii <eliz@gnu.org> | 5 | 2013-10-25 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * w32uniscribe.c (uniscribe_close): Adjust the argument list to | 7 | * 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. */) | |||
| 1690 | DEFUN ("set-fringe-bitmap-face", Fset_fringe_bitmap_face, Sset_fringe_bitmap_face, | 1690 | DEFUN ("set-fringe-bitmap-face", Fset_fringe_bitmap_face, Sset_fringe_bitmap_face, |
| 1691 | 1, 2, 0, | 1691 | 1, 2, 0, |
| 1692 | doc: /* Set face for fringe bitmap BITMAP to FACE. | 1692 | doc: /* Set face for fringe bitmap BITMAP to FACE. |
| 1693 | FACE is merged with the `fringe' face, so normally FACE should specify | ||
| 1694 | only the foreground color. | ||
| 1693 | If FACE is nil, reset face to default fringe face. */) | 1695 | If FACE is nil, reset face to default fringe face. */) |
| 1694 | (Lisp_Object bitmap, Lisp_Object face) | 1696 | (Lisp_Object bitmap, Lisp_Object face) |
| 1695 | { | 1697 | { |