aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2010-07-21 12:45:01 +0200
committerJuanma Barranquero2010-07-21 12:45:01 +0200
commit14fb57049117cfa49e26e7b8ac42951ce83cc03d (patch)
treed7a75bee78b7216ccd2dede853b331648b3dd453 /src
parent604f7ca6ec1d91a13a77f7338c1866d23e5434dd (diff)
downloademacs-14fb57049117cfa49e26e7b8ac42951ce83cc03d.tar.gz
emacs-14fb57049117cfa49e26e7b8ac42951ce83cc03d.zip
* buffer.c (syms_of_buffer) <fringe-indicator-alist>: Doc fix.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/buffer.c8
2 files changed, 8 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c3d77fc754d..f50f1771232 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12010-07-21 Juanma Barranquero <lekktu@gmail.com>
2
3 * buffer.c (syms_of_buffer) <fringe-indicator-alist>: Doc fix.
4
12010-07-17 Jan Djärv <jan.h.d@swipnet.se> 52010-07-17 Jan Djärv <jan.h.d@swipnet.se>
2 6
3 * gtkutil.c (xg_event_is_for_menubar): Also check that event window 7 * gtkutil.c (xg_event_is_for_menubar): Also check that event window
diff --git a/src/buffer.c b/src/buffer.c
index a0acad309af..adb85b83e5f 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -6032,14 +6032,14 @@ fringe indicator.
6032 6032
6033INDICATOR specifies the logical indicator type which is one of the 6033INDICATOR specifies the logical indicator type which is one of the
6034following symbols: `truncation' , `continuation', `overlay-arrow', 6034following symbols: `truncation' , `continuation', `overlay-arrow',
6035`top', `bottom', `up', `down', `one-line', `empty-line', or `unknown'. 6035`top', `bottom', `top-bottom', `up', `down', empty-line', or `unknown'.
6036 6036
6037BITMAPS is list of symbols (LEFT RIGHT [LEFT1 RIGHT1]) which specifies 6037BITMAPS is a list of symbols (LEFT RIGHT [LEFT1 RIGHT1]) which specifies
6038the actual bitmap shown in the left or right fringe for the logical 6038the actual bitmap shown in the left or right fringe for the logical
6039indicator. LEFT and RIGHT are the bitmaps shown in the left and/or 6039indicator. LEFT and RIGHT are the bitmaps shown in the left and/or
6040right fringe for the specific indicator. The LEFT1 or RIGHT1 bitmaps 6040right fringe for the specific indicator. The LEFT1 or RIGHT1 bitmaps
6041are used only for the `bottom' and `one-line' indicators when the last 6041are used only for the `bottom' and `top-bottom' indicators when the
6042\(only) line in has no final newline. BITMAPS may also be a single 6042last (only) line has no final newline. BITMAPS may also be a single
6043symbol which is used in both left and right fringes. */); 6043symbol which is used in both left and right fringes. */);
6044 6044
6045 DEFVAR_PER_BUFFER ("fringe-cursor-alist", 6045 DEFVAR_PER_BUFFER ("fringe-cursor-alist",