Mercurial > emacs
comparison src/buffer.c @ 90428:a8190f7e546e
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 285-296)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: admin/FOR-RELEASE: Update refcard section.
* gnus--rel--5.10 (patch 102-104)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 07 Jun 2006 18:05:10 +0000 |
parents | 8a1ee48a8386 83b791ca7b11 |
children | 8a8e69664178 |
comparison
equal
deleted
inserted
replaced
90427:ddb25860d044 | 90428:a8190f7e546e |
---|---|
2479 | 2479 |
2480 /* Find all the overlays in the current buffer that contain position POS. | 2480 /* Find all the overlays in the current buffer that contain position POS. |
2481 Return the number found, and store them in a vector in *VEC_PTR. | 2481 Return the number found, and store them in a vector in *VEC_PTR. |
2482 Store in *LEN_PTR the size allocated for the vector. | 2482 Store in *LEN_PTR the size allocated for the vector. |
2483 Store in *NEXT_PTR the next position after POS where an overlay starts, | 2483 Store in *NEXT_PTR the next position after POS where an overlay starts, |
2484 or ZV if there are no more overlays. | 2484 or ZV if there are no more overlays between POS and ZV. |
2485 Store in *PREV_PTR the previous position before POS where an overlay ends, | 2485 Store in *PREV_PTR the previous position before POS where an overlay ends, |
2486 or where an overlay starts which ends at or after POS; | 2486 or where an overlay starts which ends at or after POS; |
2487 or BEGV if there are no such overlays. | 2487 or BEGV if there are no such overlays from BEGV to POS. |
2488 NEXT_PTR and/or PREV_PTR may be 0, meaning don't store that info. | 2488 NEXT_PTR and/or PREV_PTR may be 0, meaning don't store that info. |
2489 | 2489 |
2490 *VEC_PTR and *LEN_PTR should contain a valid vector and size | 2490 *VEC_PTR and *LEN_PTR should contain a valid vector and size |
2491 when this function is called. | 2491 when this function is called. |
2492 | 2492 |
3568 doc: /* Create a new overlay with range BEG to END in BUFFER. | 3568 doc: /* Create a new overlay with range BEG to END in BUFFER. |
3569 If omitted, BUFFER defaults to the current buffer. | 3569 If omitted, BUFFER defaults to the current buffer. |
3570 BEG and END may be integers or markers. | 3570 BEG and END may be integers or markers. |
3571 The fourth arg FRONT-ADVANCE, if non-nil, makes the marker | 3571 The fourth arg FRONT-ADVANCE, if non-nil, makes the marker |
3572 for the front of the overlay advance when text is inserted there | 3572 for the front of the overlay advance when text is inserted there |
3573 (which means the text *is not* included in the overlay). | 3573 \(which means the text *is not* included in the overlay). |
3574 The fifth arg REAR-ADVANCE, if non-nil, makes the marker | 3574 The fifth arg REAR-ADVANCE, if non-nil, makes the marker |
3575 for the rear of the overlay advance when text is inserted there | 3575 for the rear of the overlay advance when text is inserted there |
3576 (which means the text *is* included in the overlay). */) | 3576 \(which means the text *is* included in the overlay). */) |
3577 (beg, end, buffer, front_advance, rear_advance) | 3577 (beg, end, buffer, front_advance, rear_advance) |
3578 Lisp_Object beg, end, buffer; | 3578 Lisp_Object beg, end, buffer; |
3579 Lisp_Object front_advance, rear_advance; | 3579 Lisp_Object front_advance, rear_advance; |
3580 { | 3580 { |
3581 Lisp_Object overlay; | 3581 Lisp_Object overlay; |
3953 } | 3953 } |
3954 | 3954 |
3955 DEFUN ("next-overlay-change", Fnext_overlay_change, Snext_overlay_change, | 3955 DEFUN ("next-overlay-change", Fnext_overlay_change, Snext_overlay_change, |
3956 1, 1, 0, | 3956 1, 1, 0, |
3957 doc: /* Return the next position after POS where an overlay starts or ends. | 3957 doc: /* Return the next position after POS where an overlay starts or ends. |
3958 If there are no more overlay boundaries after POS, return (point-max). */) | 3958 If there are no overlay boundaries from POS to (point-max), |
3959 the value is (point-max). */) | |
3959 (pos) | 3960 (pos) |
3960 Lisp_Object pos; | 3961 Lisp_Object pos; |
3961 { | 3962 { |
3962 int noverlays; | 3963 int noverlays; |
3963 int endpos; | 3964 int endpos; |
3994 } | 3995 } |
3995 | 3996 |
3996 DEFUN ("previous-overlay-change", Fprevious_overlay_change, | 3997 DEFUN ("previous-overlay-change", Fprevious_overlay_change, |
3997 Sprevious_overlay_change, 1, 1, 0, | 3998 Sprevious_overlay_change, 1, 1, 0, |
3998 doc: /* Return the previous position before POS where an overlay starts or ends. | 3999 doc: /* Return the previous position before POS where an overlay starts or ends. |
3999 If there are no more overlay boundaries before POS, return (point-min). */) | 4000 If there are no overlay boundaries from (point-min) to POS, |
4001 the value is (point-min). */) | |
4000 (pos) | 4002 (pos) |
4001 Lisp_Object pos; | 4003 Lisp_Object pos; |
4002 { | 4004 { |
4003 int noverlays; | 4005 int noverlays; |
4004 int prevpos; | 4006 int prevpos; |
5452 %i -- print the size of the buffer. | 5454 %i -- print the size of the buffer. |
5453 %I -- like %i, but use k, M, G, etc., to abbreviate. | 5455 %I -- like %i, but use k, M, G, etc., to abbreviate. |
5454 %p -- print percent of buffer above top of window, or Top, Bot or All. | 5456 %p -- print percent of buffer above top of window, or Top, Bot or All. |
5455 %P -- print percent of buffer above bottom of window, perhaps plus Top, | 5457 %P -- print percent of buffer above bottom of window, perhaps plus Top, |
5456 or print Bottom or All. | 5458 or print Bottom or All. |
5457 %m -- print the mode name. | |
5458 %n -- print Narrow if appropriate. | 5459 %n -- print Narrow if appropriate. |
5460 %t -- visited file is text or binary (if OS supports this distinction). | |
5459 %z -- print mnemonics of buffer, terminal, and keyboard coding systems. | 5461 %z -- print mnemonics of buffer, terminal, and keyboard coding systems. |
5460 %Z -- like %z, but including the end-of-line format. | 5462 %Z -- like %z, but including the end-of-line format. |
5463 %e -- print error message about full memory. | |
5461 %[ -- print one [ for each recursive editing level. %] similar. | 5464 %[ -- print one [ for each recursive editing level. %] similar. |
5462 %% -- print %. %- -- print infinitely many dashes. | 5465 %% -- print %. %- -- print infinitely many dashes. |
5463 Decimal digits after the % specify field width to which to pad. */); | 5466 Decimal digits after the % specify field width to which to pad. */); |
5464 | 5467 |
5465 DEFVAR_LISP_NOPRO ("default-major-mode", &buffer_defaults.major_mode, | 5468 DEFVAR_LISP_NOPRO ("default-major-mode", &buffer_defaults.major_mode, |
5751 BITMAPS is list of symbols (LEFT RIGHT [LEFT1 RIGHT1]) which specifies | 5754 BITMAPS is list of symbols (LEFT RIGHT [LEFT1 RIGHT1]) which specifies |
5752 the actual bitmap shown in the left or right fringe for the logical | 5755 the actual bitmap shown in the left or right fringe for the logical |
5753 indicator. LEFT and RIGHT are the bitmaps shown in the left and/or | 5756 indicator. LEFT and RIGHT are the bitmaps shown in the left and/or |
5754 right fringe for the specific indicator. The LEFT1 or RIGHT1 bitmaps | 5757 right fringe for the specific indicator. The LEFT1 or RIGHT1 bitmaps |
5755 are used only for the `bottom' and `one-line' indicators when the last | 5758 are used only for the `bottom' and `one-line' indicators when the last |
5756 (only) line in has no final newline. BITMAPS may also be a single | 5759 \(only) line in has no final newline. BITMAPS may also be a single |
5757 symbol which is used in both left and right fringes. */); | 5760 symbol which is used in both left and right fringes. */); |
5758 | 5761 |
5759 DEFVAR_PER_BUFFER ("fringe-cursor-alist", | 5762 DEFVAR_PER_BUFFER ("fringe-cursor-alist", |
5760 ¤t_buffer->fringe_cursor_alist, Qnil, | 5763 ¤t_buffer->fringe_cursor_alist, Qnil, |
5761 doc: /* *Mapping from logical to physical fringe cursor bitmaps. | 5764 doc: /* *Mapping from logical to physical fringe cursor bitmaps. |
5998 DEFVAR_PER_BUFFER ("line-spacing", | 6001 DEFVAR_PER_BUFFER ("line-spacing", |
5999 ¤t_buffer->extra_line_spacing, Qnil, | 6002 ¤t_buffer->extra_line_spacing, Qnil, |
6000 doc: /* Additional space to put between lines when displaying a buffer. | 6003 doc: /* Additional space to put between lines when displaying a buffer. |
6001 The space is measured in pixels, and put below lines on window systems. | 6004 The space is measured in pixels, and put below lines on window systems. |
6002 If value is a floating point number, it specifies the spacing relative | 6005 If value is a floating point number, it specifies the spacing relative |
6003 to the default frame line height. */); | 6006 to the default frame line height. nil means add no extra space. */); |
6004 | 6007 |
6005 DEFVAR_PER_BUFFER ("cursor-in-non-selected-windows", | 6008 DEFVAR_PER_BUFFER ("cursor-in-non-selected-windows", |
6006 ¤t_buffer->cursor_in_non_selected_windows, Qnil, | 6009 ¤t_buffer->cursor_in_non_selected_windows, Qnil, |
6007 doc: /* *Cursor type to display in non-selected windows. | 6010 doc: /* *Cursor type to display in non-selected windows. |
6008 t means to use hollow box cursor. See `cursor-type' for other values. */); | 6011 t means to use hollow box cursor. See `cursor-type' for other values. */); |