diff options
author | Juanma Barranquero <lekktu@gmail.com> | 2010-07-27 04:10:05 +0200 |
---|---|---|
committer | Juanma Barranquero <lekktu@gmail.com> | 2010-07-27 04:10:05 +0200 |
commit | 0ed082fedf31241b54ef2294c29c4880a7472e0e (patch) | |
tree | 096e3bcc109e439b48fb299bae744d58f3d09377 /src/buffer.c | |
parent | aa2d4bd3438df0855c168c960e03d1f8ea25ae71 (diff) | |
parent | 4ce5a4ccd4cca6dcdc6d8bafa8cfaea1986e7e6e (diff) | |
download | emacs-0ed082fedf31241b54ef2294c29c4880a7472e0e.tar.gz |
Merge from emacs-23
Diffstat (limited to 'src/buffer.c')
-rw-r--r-- | src/buffer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/buffer.c b/src/buffer.c index ac39219e61e..a90262fc557 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -5899,14 +5899,14 @@ fringe indicator. INDICATOR specifies the logical indicator type which is one of the following symbols: `truncation' , `continuation', `overlay-arrow', -`top', `bottom', `up', `down', `one-line', `empty-line', or `unknown'. +`top', `bottom', `top-bottom', `up', `down', empty-line', or `unknown'. -BITMAPS is list of symbols (LEFT RIGHT [LEFT1 RIGHT1]) which specifies +BITMAPS is a list of symbols (LEFT RIGHT [LEFT1 RIGHT1]) which specifies the actual bitmap shown in the left or right fringe for the logical indicator. LEFT and RIGHT are the bitmaps shown in the left and/or right fringe for the specific indicator. The LEFT1 or RIGHT1 bitmaps -are used only for the `bottom' and `one-line' indicators when the last -\(only) line in has no final newline. BITMAPS may also be a single +are used only for the `bottom' and `top-bottom' indicators when the +last (only) line has no final newline. BITMAPS may also be a single symbol which is used in both left and right fringes. */); DEFVAR_PER_BUFFER ("fringe-cursor-alist", |