diff options
| author | Karoly Lorentey | 2006-05-20 10:32:11 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2006-05-20 10:32:11 +0000 |
| commit | aabd1a8b138a7f5907c3bb0bbd40932fa7b8e9fe (patch) | |
| tree | 7db1ed5481ec4ec6b43271d0ea57c032c22f60fc /src/buffer.c | |
| parent | 9f97e26d01003a17b861505d535c89ad73799b7e (diff) | |
| parent | 689840b9224725a0beae741aaaa325d7edb2244c (diff) | |
| download | emacs-aabd1a8b138a7f5907c3bb0bbd40932fa7b8e9fe.tar.gz emacs-aabd1a8b138a7f5907c3bb0bbd40932fa7b8e9fe.zip | |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-285
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-286
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-287
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-288
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-102
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-558
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/buffer.c b/src/buffer.c index baa977ab853..6317c14d393 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -2495,10 +2495,10 @@ swap_out_buffer_local_variables (b) | |||
| 2495 | Return the number found, and store them in a vector in *VEC_PTR. | 2495 | Return the number found, and store them in a vector in *VEC_PTR. |
| 2496 | Store in *LEN_PTR the size allocated for the vector. | 2496 | Store in *LEN_PTR the size allocated for the vector. |
| 2497 | Store in *NEXT_PTR the next position after POS where an overlay starts, | 2497 | Store in *NEXT_PTR the next position after POS where an overlay starts, |
| 2498 | or ZV if there are no more overlays. | 2498 | or ZV if there are no more overlays between POS and ZV. |
| 2499 | Store in *PREV_PTR the previous position before POS where an overlay ends, | 2499 | Store in *PREV_PTR the previous position before POS where an overlay ends, |
| 2500 | or where an overlay starts which ends at or after POS; | 2500 | or where an overlay starts which ends at or after POS; |
| 2501 | or BEGV if there are no such overlays. | 2501 | or BEGV if there are no such overlays from BEGV to POS. |
| 2502 | NEXT_PTR and/or PREV_PTR may be 0, meaning don't store that info. | 2502 | NEXT_PTR and/or PREV_PTR may be 0, meaning don't store that info. |
| 2503 | 2503 | ||
| 2504 | *VEC_PTR and *LEN_PTR should contain a valid vector and size | 2504 | *VEC_PTR and *LEN_PTR should contain a valid vector and size |
| @@ -3969,7 +3969,8 @@ or between BEG and END. */) | |||
| 3969 | DEFUN ("next-overlay-change", Fnext_overlay_change, Snext_overlay_change, | 3969 | DEFUN ("next-overlay-change", Fnext_overlay_change, Snext_overlay_change, |
| 3970 | 1, 1, 0, | 3970 | 1, 1, 0, |
| 3971 | doc: /* Return the next position after POS where an overlay starts or ends. | 3971 | doc: /* Return the next position after POS where an overlay starts or ends. |
| 3972 | If there are no more overlay boundaries after POS, return (point-max). */) | 3972 | If there are no overlay boundaries from POS to (point-max), |
| 3973 | the value is (point-max). */) | ||
| 3973 | (pos) | 3974 | (pos) |
| 3974 | Lisp_Object pos; | 3975 | Lisp_Object pos; |
| 3975 | { | 3976 | { |
| @@ -4010,7 +4011,8 @@ If there are no more overlay boundaries after POS, return (point-max). */) | |||
| 4010 | DEFUN ("previous-overlay-change", Fprevious_overlay_change, | 4011 | DEFUN ("previous-overlay-change", Fprevious_overlay_change, |
| 4011 | Sprevious_overlay_change, 1, 1, 0, | 4012 | Sprevious_overlay_change, 1, 1, 0, |
| 4012 | doc: /* Return the previous position before POS where an overlay starts or ends. | 4013 | doc: /* Return the previous position before POS where an overlay starts or ends. |
| 4013 | If there are no more overlay boundaries before POS, return (point-min). */) | 4014 | If there are no overlay boundaries from (point-min) to POS, |
| 4015 | the value is (point-min). */) | ||
| 4014 | (pos) | 4016 | (pos) |
| 4015 | Lisp_Object pos; | 4017 | Lisp_Object pos; |
| 4016 | { | 4018 | { |