aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim F. Storm2006-02-20 22:14:06 +0000
committerKim F. Storm2006-02-20 22:14:06 +0000
commitc6a46372a3684f4183b8a97da4eef79f9c002b8b (patch)
treee4778b7ba8bc50a5aaa58c9d0fa4477f06f08c97
parente13be7a27306b1f1c7289801e47cdb093e9b0f3e (diff)
downloademacs-c6a46372a3684f4183b8a97da4eef79f9c002b8b.tar.gz
emacs-c6a46372a3684f4183b8a97da4eef79f9c002b8b.zip
(init_buffer_once): Set dummy default values for
fringe-indicator-alist and fringe-cursor-alist. The proper default values are set by pre-loading fringe.el. (syms_of_buffer): defvar_per_buffer new fringe-indicator-alist and fringe-cursor-alist buffer-local variables and defvar_lisp_nopro correspondig default- variables.
-rw-r--r--src/buffer.c48
1 files changed, 48 insertions, 0 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 5c3d1068d1d..9388025808c 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4993,6 +4993,8 @@ init_buffer_once ()
4993 buffer_defaults.vertical_scroll_bar_type = Qt; 4993 buffer_defaults.vertical_scroll_bar_type = Qt;
4994 buffer_defaults.indicate_empty_lines = Qnil; 4994 buffer_defaults.indicate_empty_lines = Qnil;
4995 buffer_defaults.indicate_buffer_boundaries = Qnil; 4995 buffer_defaults.indicate_buffer_boundaries = Qnil;
4996 buffer_defaults.fringe_indicator_alist = Qnil;
4997 buffer_defaults.fringe_cursor_alist = Qnil;
4996 buffer_defaults.scroll_up_aggressively = Qnil; 4998 buffer_defaults.scroll_up_aggressively = Qnil;
4997 buffer_defaults.scroll_down_aggressively = Qnil; 4999 buffer_defaults.scroll_down_aggressively = Qnil;
4998 buffer_defaults.display_time = Qnil; 5000 buffer_defaults.display_time = Qnil;
@@ -5064,6 +5066,8 @@ init_buffer_once ()
5064 XSETFASTINT (buffer_local_flags.vertical_scroll_bar_type, idx); ++idx; 5066 XSETFASTINT (buffer_local_flags.vertical_scroll_bar_type, idx); ++idx;
5065 XSETFASTINT (buffer_local_flags.indicate_empty_lines, idx); ++idx; 5067 XSETFASTINT (buffer_local_flags.indicate_empty_lines, idx); ++idx;
5066 XSETFASTINT (buffer_local_flags.indicate_buffer_boundaries, idx); ++idx; 5068 XSETFASTINT (buffer_local_flags.indicate_buffer_boundaries, idx); ++idx;
5069 XSETFASTINT (buffer_local_flags.fringe_indicator_alist, idx); ++idx;
5070 XSETFASTINT (buffer_local_flags.fringe_cursor_alist, idx); ++idx;
5067 XSETFASTINT (buffer_local_flags.scroll_up_aggressively, idx); ++idx; 5071 XSETFASTINT (buffer_local_flags.scroll_up_aggressively, idx); ++idx;
5068 XSETFASTINT (buffer_local_flags.scroll_down_aggressively, idx); ++idx; 5072 XSETFASTINT (buffer_local_flags.scroll_down_aggressively, idx); ++idx;
5069 XSETFASTINT (buffer_local_flags.header_line_format, idx); ++idx; 5073 XSETFASTINT (buffer_local_flags.header_line_format, idx); ++idx;
@@ -5357,6 +5361,16 @@ This is the same as (default-value 'indicate-empty-lines). */);
5357 doc: /* Default value of `indicate-buffer-boundaries' for buffers that don't override it. 5361 doc: /* Default value of `indicate-buffer-boundaries' for buffers that don't override it.
5358This is the same as (default-value 'indicate-buffer-boundaries). */); 5362This is the same as (default-value 'indicate-buffer-boundaries). */);
5359 5363
5364 DEFVAR_LISP_NOPRO ("default-fringe-indicator-alist",
5365 &buffer_defaults.fringe_indicator_alist,
5366 doc: /* Default value of `fringe-indicator-alist' for buffers that don't override it.
5367This is the same as (default-value 'fringe-indicator-alist'). */);
5368
5369 DEFVAR_LISP_NOPRO ("default-fringe-cursor-alist",
5370 &buffer_defaults.fringe_cursor_alist,
5371 doc: /* Default value of `fringe-cursor-alist' for buffers that don't override it.
5372This is the same as (default-value 'fringe-cursor-alist'). */);
5373
5360 DEFVAR_LISP_NOPRO ("default-scroll-up-aggressively", 5374 DEFVAR_LISP_NOPRO ("default-scroll-up-aggressively",
5361 &buffer_defaults.scroll_up_aggressively, 5375 &buffer_defaults.scroll_up_aggressively,
5362 doc: /* Default value of `scroll-up-aggressively'. 5376 doc: /* Default value of `scroll-up-aggressively'.
@@ -5702,6 +5716,40 @@ left fringe, the bottom angle bitmap in right fringe, and both arrow
5702bitmaps in right fringe. To show just the angle bitmaps in the left 5716bitmaps in right fringe. To show just the angle bitmaps in the left
5703fringe, but no arrow bitmaps, use ((top . left) (bottom . left)). */); 5717fringe, but no arrow bitmaps, use ((top . left) (bottom . left)). */);
5704 5718
5719 DEFVAR_PER_BUFFER ("fringe-indicator-alist",
5720 &current_buffer->fringe_indicator_alist, Qnil,
5721 doc: /* *Mapping from logical to physical fringe indicator bitmaps.
5722The value is an alist where each element (INDICATOR . BITMAPS)
5723specifies the fringe bitmaps used to display a specific logical
5724fringe indicator.
5725
5726INDICATOR specifies the logical indicator type which is one of the
5727following symbols: `truncation' , `continuation', `overlay-arrow',
5728`top', `bottom', `up', `down', `one-line', `empty-line', or `unknown'.
5729
5730BITMAPS is list of symbols (LEFT RIGHT [LEFT1 RIGHT1]) which specifies
5731the actual bitmap shown in the left or right fringe for the logical
5732indicator. LEFT and RIGHT are the bitmaps shown in the left and/or
5733right fringe for the specific indicator. The LEFT1 or RIGHT1 bitmaps
5734are used only for the `bottom' and `one-line' indicators when the last
5735(only) line in has no final newline. BITMAPS may also be a single
5736symbol which is used in both left and right fringes. */);
5737
5738 DEFVAR_PER_BUFFER ("fringe-cursor-alist",
5739 &current_buffer->fringe_cursor_alist, Qnil,
5740 doc: /* *Mapping from logical to physical fringe cursor bitmaps.
5741The value is an alist where each element (CURSOR . BITMAP)
5742specifies the fringe bitmaps used to display a specific logical
5743cursor type in the fringe.
5744
5745CURSOR specifies the logical cursor type which is one of the following
5746symbols: `box' , `hollow', `bar', `hbar', or `hollow-small'. The last
5747one is used to show a hollow cursor on narrow lines display lines
5748where the normal hollow cursor will not fit.
5749
5750BITMAP is the corresponding fringe bitmap shown for the logical
5751cursor type. */);
5752
5705 DEFVAR_PER_BUFFER ("scroll-up-aggressively", 5753 DEFVAR_PER_BUFFER ("scroll-up-aggressively",
5706 &current_buffer->scroll_up_aggressively, Qnil, 5754 &current_buffer->scroll_up_aggressively, Qnil,
5707 doc: /* How far to scroll windows upward. 5755 doc: /* How far to scroll windows upward.