Mercurial > emacs
comparison src/buffer.c @ 90203:187d6a1f84f7
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-71
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 485-492)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 92-94)
- Merge from emacs--cvs-trunk--0
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 22 Jul 2005 08:27:27 +0000 |
| parents | f9a65d7ebd29 339bbffbcd05 |
| children | 2d92f5c9d6ae |
comparison
equal
deleted
inserted
replaced
| 90202:7597b4a23c3b | 90203:187d6a1f84f7 |
|---|---|
| 3571 | 3571 |
| 3572 DEFUN ("make-overlay", Fmake_overlay, Smake_overlay, 2, 5, 0, | 3572 DEFUN ("make-overlay", Fmake_overlay, Smake_overlay, 2, 5, 0, |
| 3573 doc: /* Create a new overlay with range BEG to END in BUFFER. | 3573 doc: /* Create a new overlay with range BEG to END in BUFFER. |
| 3574 If omitted, BUFFER defaults to the current buffer. | 3574 If omitted, BUFFER defaults to the current buffer. |
| 3575 BEG and END may be integers or markers. | 3575 BEG and END may be integers or markers. |
| 3576 The fourth arg FRONT-ADVANCE, if non-nil, makes the | 3576 The fourth arg FRONT-ADVANCE, if non-nil, makes the marker |
| 3577 front delimiter advance when text is inserted there. | 3577 for the front of the overlay advance when text is inserted there |
| 3578 The fifth arg REAR-ADVANCE, if non-nil, makes the | 3578 (which means the text *is not* included in the overlay). |
| 3579 rear delimiter advance when text is inserted there. */) | 3579 The fifth arg REAR-ADVANCE, if non-nil, makes the marker |
| 3580 for the rear of the overlay advance when text is inserted there | |
| 3581 (which means the text *is* included in the overlay). */) | |
| 3580 (beg, end, buffer, front_advance, rear_advance) | 3582 (beg, end, buffer, front_advance, rear_advance) |
| 3581 Lisp_Object beg, end, buffer; | 3583 Lisp_Object beg, end, buffer; |
| 3582 Lisp_Object front_advance, rear_advance; | 3584 Lisp_Object front_advance, rear_advance; |
| 3583 { | 3585 { |
| 3584 Lisp_Object overlay; | 3586 Lisp_Object overlay; |
| 5741 means scroll to center point. A fraction means scroll to put point | 5743 means scroll to center point. A fraction means scroll to put point |
| 5742 that fraction of the window's height from the bottom of the window. | 5744 that fraction of the window's height from the bottom of the window. |
| 5743 When the value is 0.0, point goes at the bottom line, which in the simple | 5745 When the value is 0.0, point goes at the bottom line, which in the simple |
| 5744 case that you moved off with C-f means scrolling just one line. 1.0 means | 5746 case that you moved off with C-f means scrolling just one line. 1.0 means |
| 5745 point goes at the top, so that in that simple case, the window | 5747 point goes at the top, so that in that simple case, the window |
| 5746 window scrolls by a full window height. Meaningful values are | 5748 scrolls by a full window height. Meaningful values are |
| 5747 between 0.0 and 1.0, inclusive. */); | 5749 between 0.0 and 1.0, inclusive. */); |
| 5748 | 5750 |
| 5749 DEFVAR_PER_BUFFER ("scroll-down-aggressively", | 5751 DEFVAR_PER_BUFFER ("scroll-down-aggressively", |
| 5750 ¤t_buffer->scroll_down_aggressively, Qnil, | 5752 ¤t_buffer->scroll_down_aggressively, Qnil, |
| 5751 doc: /* How far to scroll windows downward. | 5753 doc: /* How far to scroll windows downward. |
| 5754 means scroll to center point. A fraction means scroll to put point | 5756 means scroll to center point. A fraction means scroll to put point |
| 5755 that fraction of the window's height from the top of the window. | 5757 that fraction of the window's height from the top of the window. |
| 5756 When the value is 0.0, point goes at the top line, which in the simple | 5758 When the value is 0.0, point goes at the top line, which in the simple |
| 5757 case that you moved off with C-b means scrolling just one line. 1.0 means | 5759 case that you moved off with C-b means scrolling just one line. 1.0 means |
| 5758 point goes at the bottom, so that in that simple case, the window | 5760 point goes at the bottom, so that in that simple case, the window |
| 5759 window scrolls by a full window height. Meaningful values are | 5761 scrolls by a full window height. Meaningful values are |
| 5760 between 0.0 and 1.0, inclusive. */); | 5762 between 0.0 and 1.0, inclusive. */); |
| 5761 | 5763 |
| 5762 /*DEFVAR_LISP ("debug-check-symbol", &Vcheck_symbol, | 5764 /*DEFVAR_LISP ("debug-check-symbol", &Vcheck_symbol, |
| 5763 "Don't ask."); | 5765 "Don't ask."); |
| 5764 */ | 5766 */ |
| 5942 | 5944 |
| 5943 DEFVAR_PER_BUFFER ("cursor-type", ¤t_buffer->cursor_type, Qnil, | 5945 DEFVAR_PER_BUFFER ("cursor-type", ¤t_buffer->cursor_type, Qnil, |
| 5944 doc: /* Cursor to use when this buffer is in the selected window. | 5946 doc: /* Cursor to use when this buffer is in the selected window. |
| 5945 Values are interpreted as follows: | 5947 Values are interpreted as follows: |
| 5946 | 5948 |
| 5947 t use the cursor specified for the frame | 5949 t use the cursor specified for the frame |
| 5948 nil don't display a cursor | 5950 nil don't display a cursor |
| 5949 box display a filled box cursor | 5951 box display a filled box cursor |
| 5950 hollow display a hollow box cursor | 5952 hollow display a hollow box cursor |
| 5951 bar display a vertical bar cursor with default width | 5953 bar display a vertical bar cursor with default width |
| 5952 (bar . WIDTH) display a vertical bar cursor with width WIDTH | 5954 (bar . WIDTH) display a vertical bar cursor with width WIDTH |
| 5953 hbar display a horizontal bar cursor with default height | 5955 hbar display a horizontal bar cursor with default height |
| 5954 (hbar . HEIGHT) display a horizontal bar cursor with height HEIGHT | 5956 (hbar . HEIGHT) display a horizontal bar cursor with height HEIGHT |
| 5955 ANYTHING ELSE display a hollow box cursor. | 5957 ANYTHING ELSE display a hollow box cursor |
| 5956 | 5958 |
| 5957 When the buffer is displayed in a nonselected window, | 5959 When the buffer is displayed in a nonselected window, |
| 5958 this variable has no effect; the cursor appears as a hollow box. */); | 5960 this variable has no effect; the cursor appears as a hollow box. */); |
| 5959 | 5961 |
| 5960 DEFVAR_PER_BUFFER ("line-spacing", | 5962 DEFVAR_PER_BUFFER ("line-spacing", |
