Mercurial > emacs
comparison src/buffer.c @ 90729:6588c6259dfb
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 545-562)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- erc-iswitchb: Temporarily enable iswitchb mode
* gnus--rel--5.10 (patch 172-176)
- Merge from emacs--devo--0
- Update from CVS
- Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-156
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 16 Dec 2006 01:29:26 +0000 |
parents | f1d13e615070 42f97e1a6081 |
children | bc10a33dd40b |
comparison
equal
deleted
inserted
replaced
90728:a65a92d83186 | 90729:6588c6259dfb |
---|---|
5445 | 5445 |
5446 DEFVAR_LISP_NOPRO ("default-scroll-up-aggressively", | 5446 DEFVAR_LISP_NOPRO ("default-scroll-up-aggressively", |
5447 &buffer_defaults.scroll_up_aggressively, | 5447 &buffer_defaults.scroll_up_aggressively, |
5448 doc: /* Default value of `scroll-up-aggressively'. | 5448 doc: /* Default value of `scroll-up-aggressively'. |
5449 This value applies in buffers that don't have their own local values. | 5449 This value applies in buffers that don't have their own local values. |
5450 This variable is an alias for (default-value 'scroll-up-aggressively). */); | 5450 This is the same as (default-value 'scroll-up-aggressively). */); |
5451 | 5451 |
5452 DEFVAR_LISP_NOPRO ("default-scroll-down-aggressively", | 5452 DEFVAR_LISP_NOPRO ("default-scroll-down-aggressively", |
5453 &buffer_defaults.scroll_down_aggressively, | 5453 &buffer_defaults.scroll_down_aggressively, |
5454 doc: /* Default value of `scroll-down-aggressively'. | 5454 doc: /* Default value of `scroll-down-aggressively'. |
5455 This value applies in buffers that don't have their own local values. | 5455 This value applies in buffers that don't have their own local values. |
5456 This variable is an alias for (default-value 'scroll-down-aggressively). */); | 5456 This is the same as (default-value 'scroll-down-aggressively). */); |
5457 | 5457 |
5458 DEFVAR_PER_BUFFER ("header-line-format", | 5458 DEFVAR_PER_BUFFER ("header-line-format", |
5459 ¤t_buffer->header_line_format, | 5459 ¤t_buffer->header_line_format, |
5460 Qnil, | 5460 Qnil, |
5461 doc: /* Analogous to `mode-line-format', but controls the header line. | 5461 doc: /* Analogous to `mode-line-format', but controls the header line. |
5514 %% -- print %. %- -- print infinitely many dashes. | 5514 %% -- print %. %- -- print infinitely many dashes. |
5515 Decimal digits after the % specify field width to which to pad. */); | 5515 Decimal digits after the % specify field width to which to pad. */); |
5516 | 5516 |
5517 DEFVAR_LISP_NOPRO ("default-major-mode", &buffer_defaults.major_mode, | 5517 DEFVAR_LISP_NOPRO ("default-major-mode", &buffer_defaults.major_mode, |
5518 doc: /* *Major mode for new buffers. Defaults to `fundamental-mode'. | 5518 doc: /* *Major mode for new buffers. Defaults to `fundamental-mode'. |
5519 nil here means use current buffer's major mode, provided it is not | 5519 A value of nil means use current buffer's major mode, |
5520 marked as "special". | 5520 provided it is not marked as "special". |
5521 | 5521 |
5522 When a mode is used by default, `find-file' switches to it | 5522 When a mode is used by default, `find-file' switches to it |
5523 before it reads the contents into the buffer and before | 5523 before it reads the contents into the buffer and before |
5524 it finishes setting up the buffer. Thus, the mode and | 5524 it finishes setting up the buffer. Thus, the mode and |
5525 its hooks should not expect certain variables such as | 5525 its hooks should not expect certain variables such as |
5545 doc: /* *Column beyond which automatic line-wrapping should happen. | 5545 doc: /* *Column beyond which automatic line-wrapping should happen. |
5546 Interactively, you can set the buffer local value using \\[set-fill-column]. */); | 5546 Interactively, you can set the buffer local value using \\[set-fill-column]. */); |
5547 | 5547 |
5548 DEFVAR_PER_BUFFER ("left-margin", ¤t_buffer->left_margin, | 5548 DEFVAR_PER_BUFFER ("left-margin", ¤t_buffer->left_margin, |
5549 make_number (Lisp_Int), | 5549 make_number (Lisp_Int), |
5550 doc: /* *Column for the default indent-line-function to indent to. | 5550 doc: /* *Column for the default `indent-line-function' to indent to. |
5551 Linefeed indents to this column in Fundamental mode. */); | 5551 Linefeed indents to this column in Fundamental mode. */); |
5552 | 5552 |
5553 DEFVAR_PER_BUFFER ("tab-width", ¤t_buffer->tab_width, | 5553 DEFVAR_PER_BUFFER ("tab-width", ¤t_buffer->tab_width, |
5554 make_number (Lisp_Int), | 5554 make_number (Lisp_Int), |
5555 doc: /* *Distance between tab stops (for display of tab characters), in columns. */); | 5555 doc: /* *Distance between tab stops (for display of tab characters), in columns. */); |
6050 DEFVAR_PER_BUFFER ("line-spacing", | 6050 DEFVAR_PER_BUFFER ("line-spacing", |
6051 ¤t_buffer->extra_line_spacing, Qnil, | 6051 ¤t_buffer->extra_line_spacing, Qnil, |
6052 doc: /* Additional space to put between lines when displaying a buffer. | 6052 doc: /* Additional space to put between lines when displaying a buffer. |
6053 The space is measured in pixels, and put below lines on window systems. | 6053 The space is measured in pixels, and put below lines on window systems. |
6054 If value is a floating point number, it specifies the spacing relative | 6054 If value is a floating point number, it specifies the spacing relative |
6055 to the default frame line height. nil means add no extra space. */); | 6055 to the default frame line height. A value of nil means add no extra space. */); |
6056 | 6056 |
6057 DEFVAR_PER_BUFFER ("cursor-in-non-selected-windows", | 6057 DEFVAR_PER_BUFFER ("cursor-in-non-selected-windows", |
6058 ¤t_buffer->cursor_in_non_selected_windows, Qnil, | 6058 ¤t_buffer->cursor_in_non_selected_windows, Qnil, |
6059 doc: /* *Cursor type to display in non-selected windows. | 6059 doc: /* *Cursor type to display in non-selected windows. |
6060 t means to use hollow box cursor. See `cursor-type' for other values. */); | 6060 The value t means to use hollow box cursor. See `cursor-type' for other values. */); |
6061 | 6061 |
6062 DEFVAR_LISP ("kill-buffer-query-functions", &Vkill_buffer_query_functions, | 6062 DEFVAR_LISP ("kill-buffer-query-functions", &Vkill_buffer_query_functions, |
6063 doc: /* List of functions called with no args to query before killing a buffer. */); | 6063 doc: /* List of functions called with no args to query before killing a buffer. */); |
6064 Vkill_buffer_query_functions = Qnil; | 6064 Vkill_buffer_query_functions = Qnil; |
6065 | 6065 |