Mercurial > emacs
comparison src/buffer.c @ 83476:866effff65a4
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-105
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-106
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-107
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-108
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-109
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-110
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-37
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-516
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Tue, 21 Feb 2006 15:57:00 +0000 |
| parents | b98066f4aa10 7e64cebb0463 |
| children | 8976b9f5eda1 |
comparison
equal
deleted
inserted
replaced
| 83475:88cd30b5064d | 83476:866effff65a4 |
|---|---|
| 5021 buffer_defaults.fringes_outside_margins = Qnil; | 5021 buffer_defaults.fringes_outside_margins = Qnil; |
| 5022 buffer_defaults.scroll_bar_width = Qnil; | 5022 buffer_defaults.scroll_bar_width = Qnil; |
| 5023 buffer_defaults.vertical_scroll_bar_type = Qt; | 5023 buffer_defaults.vertical_scroll_bar_type = Qt; |
| 5024 buffer_defaults.indicate_empty_lines = Qnil; | 5024 buffer_defaults.indicate_empty_lines = Qnil; |
| 5025 buffer_defaults.indicate_buffer_boundaries = Qnil; | 5025 buffer_defaults.indicate_buffer_boundaries = Qnil; |
| 5026 buffer_defaults.fringe_indicator_alist = Qnil; | |
| 5027 buffer_defaults.fringe_cursor_alist = Qnil; | |
| 5026 buffer_defaults.scroll_up_aggressively = Qnil; | 5028 buffer_defaults.scroll_up_aggressively = Qnil; |
| 5027 buffer_defaults.scroll_down_aggressively = Qnil; | 5029 buffer_defaults.scroll_down_aggressively = Qnil; |
| 5028 buffer_defaults.display_time = Qnil; | 5030 buffer_defaults.display_time = Qnil; |
| 5029 | 5031 |
| 5030 /* Assign the local-flags to the slots that have default values. | 5032 /* Assign the local-flags to the slots that have default values. |
| 5092 XSETFASTINT (buffer_local_flags.fringes_outside_margins, idx); ++idx; | 5094 XSETFASTINT (buffer_local_flags.fringes_outside_margins, idx); ++idx; |
| 5093 XSETFASTINT (buffer_local_flags.scroll_bar_width, idx); ++idx; | 5095 XSETFASTINT (buffer_local_flags.scroll_bar_width, idx); ++idx; |
| 5094 XSETFASTINT (buffer_local_flags.vertical_scroll_bar_type, idx); ++idx; | 5096 XSETFASTINT (buffer_local_flags.vertical_scroll_bar_type, idx); ++idx; |
| 5095 XSETFASTINT (buffer_local_flags.indicate_empty_lines, idx); ++idx; | 5097 XSETFASTINT (buffer_local_flags.indicate_empty_lines, idx); ++idx; |
| 5096 XSETFASTINT (buffer_local_flags.indicate_buffer_boundaries, idx); ++idx; | 5098 XSETFASTINT (buffer_local_flags.indicate_buffer_boundaries, idx); ++idx; |
| 5099 XSETFASTINT (buffer_local_flags.fringe_indicator_alist, idx); ++idx; | |
| 5100 XSETFASTINT (buffer_local_flags.fringe_cursor_alist, idx); ++idx; | |
| 5097 XSETFASTINT (buffer_local_flags.scroll_up_aggressively, idx); ++idx; | 5101 XSETFASTINT (buffer_local_flags.scroll_up_aggressively, idx); ++idx; |
| 5098 XSETFASTINT (buffer_local_flags.scroll_down_aggressively, idx); ++idx; | 5102 XSETFASTINT (buffer_local_flags.scroll_down_aggressively, idx); ++idx; |
| 5099 XSETFASTINT (buffer_local_flags.header_line_format, idx); ++idx; | 5103 XSETFASTINT (buffer_local_flags.header_line_format, idx); ++idx; |
| 5100 XSETFASTINT (buffer_local_flags.cursor_type, idx); ++idx; | 5104 XSETFASTINT (buffer_local_flags.cursor_type, idx); ++idx; |
| 5101 XSETFASTINT (buffer_local_flags.extra_line_spacing, idx); ++idx; | 5105 XSETFASTINT (buffer_local_flags.extra_line_spacing, idx); ++idx; |
| 5384 | 5388 |
| 5385 DEFVAR_LISP_NOPRO ("default-indicate-buffer-boundaries", | 5389 DEFVAR_LISP_NOPRO ("default-indicate-buffer-boundaries", |
| 5386 &buffer_defaults.indicate_buffer_boundaries, | 5390 &buffer_defaults.indicate_buffer_boundaries, |
| 5387 doc: /* Default value of `indicate-buffer-boundaries' for buffers that don't override it. | 5391 doc: /* Default value of `indicate-buffer-boundaries' for buffers that don't override it. |
| 5388 This is the same as (default-value 'indicate-buffer-boundaries). */); | 5392 This is the same as (default-value 'indicate-buffer-boundaries). */); |
| 5393 | |
| 5394 DEFVAR_LISP_NOPRO ("default-fringe-indicator-alist", | |
| 5395 &buffer_defaults.fringe_indicator_alist, | |
| 5396 doc: /* Default value of `fringe-indicator-alist' for buffers that don't override it. | |
| 5397 This is the same as (default-value 'fringe-indicator-alist'). */); | |
| 5398 | |
| 5399 DEFVAR_LISP_NOPRO ("default-fringe-cursor-alist", | |
| 5400 &buffer_defaults.fringe_cursor_alist, | |
| 5401 doc: /* Default value of `fringe-cursor-alist' for buffers that don't override it. | |
| 5402 This is the same as (default-value 'fringe-cursor-alist'). */); | |
| 5389 | 5403 |
| 5390 DEFVAR_LISP_NOPRO ("default-scroll-up-aggressively", | 5404 DEFVAR_LISP_NOPRO ("default-scroll-up-aggressively", |
| 5391 &buffer_defaults.scroll_up_aggressively, | 5405 &buffer_defaults.scroll_up_aggressively, |
| 5392 doc: /* Default value of `scroll-up-aggressively'. | 5406 doc: /* Default value of `scroll-up-aggressively'. |
| 5393 This value applies in buffers that don't have their own local values. | 5407 This value applies in buffers that don't have their own local values. |
| 5730 For example, ((top . left) (t . right)) places the top angle bitmap in | 5744 For example, ((top . left) (t . right)) places the top angle bitmap in |
| 5731 left fringe, the bottom angle bitmap in right fringe, and both arrow | 5745 left fringe, the bottom angle bitmap in right fringe, and both arrow |
| 5732 bitmaps in right fringe. To show just the angle bitmaps in the left | 5746 bitmaps in right fringe. To show just the angle bitmaps in the left |
| 5733 fringe, but no arrow bitmaps, use ((top . left) (bottom . left)). */); | 5747 fringe, but no arrow bitmaps, use ((top . left) (bottom . left)). */); |
| 5734 | 5748 |
| 5749 DEFVAR_PER_BUFFER ("fringe-indicator-alist", | |
| 5750 ¤t_buffer->fringe_indicator_alist, Qnil, | |
| 5751 doc: /* *Mapping from logical to physical fringe indicator bitmaps. | |
| 5752 The value is an alist where each element (INDICATOR . BITMAPS) | |
| 5753 specifies the fringe bitmaps used to display a specific logical | |
| 5754 fringe indicator. | |
| 5755 | |
| 5756 INDICATOR specifies the logical indicator type which is one of the | |
| 5757 following symbols: `truncation' , `continuation', `overlay-arrow', | |
| 5758 `top', `bottom', `up', `down', `one-line', `empty-line', or `unknown'. | |
| 5759 | |
| 5760 BITMAPS is list of symbols (LEFT RIGHT [LEFT1 RIGHT1]) which specifies | |
| 5761 the actual bitmap shown in the left or right fringe for the logical | |
| 5762 indicator. LEFT and RIGHT are the bitmaps shown in the left and/or | |
| 5763 right fringe for the specific indicator. The LEFT1 or RIGHT1 bitmaps | |
| 5764 are used only for the `bottom' and `one-line' indicators when the last | |
| 5765 (only) line in has no final newline. BITMAPS may also be a single | |
| 5766 symbol which is used in both left and right fringes. */); | |
| 5767 | |
| 5768 DEFVAR_PER_BUFFER ("fringe-cursor-alist", | |
| 5769 ¤t_buffer->fringe_cursor_alist, Qnil, | |
| 5770 doc: /* *Mapping from logical to physical fringe cursor bitmaps. | |
| 5771 The value is an alist where each element (CURSOR . BITMAP) | |
| 5772 specifies the fringe bitmaps used to display a specific logical | |
| 5773 cursor type in the fringe. | |
| 5774 | |
| 5775 CURSOR specifies the logical cursor type which is one of the following | |
| 5776 symbols: `box' , `hollow', `bar', `hbar', or `hollow-small'. The last | |
| 5777 one is used to show a hollow cursor on narrow lines display lines | |
| 5778 where the normal hollow cursor will not fit. | |
| 5779 | |
| 5780 BITMAP is the corresponding fringe bitmap shown for the logical | |
| 5781 cursor type. */); | |
| 5782 | |
| 5735 DEFVAR_PER_BUFFER ("scroll-up-aggressively", | 5783 DEFVAR_PER_BUFFER ("scroll-up-aggressively", |
| 5736 ¤t_buffer->scroll_up_aggressively, Qnil, | 5784 ¤t_buffer->scroll_up_aggressively, Qnil, |
| 5737 doc: /* How far to scroll windows upward. | 5785 doc: /* How far to scroll windows upward. |
| 5738 If you move point off the bottom, the window scrolls automatically. | 5786 If you move point off the bottom, the window scrolls automatically. |
| 5739 This variable controls how far it scrolls. nil, the default, | 5787 This variable controls how far it scrolls. nil, the default, |
