Mercurial > hg > xemacs-beta
annotate src/rangetab.h @ 5797:a1808d52a34a
If the position of a window's cached point is deleted, use buffer point instead
src/ChangeLog addition:
2014-06-17 Aidan Kehoe <kehoea@parhasard.net>
* extents.h:
* window.c:
* window.c (unshow_buffer):
* window.c (Fset_window_buffer):
Use extents, rather than markers, for the window buffer point
cache, so that when the text containing that window buffer point
is deleted, the window display code uses the buffer's actual point
instead of the position that the marker had been moved to.
Fixes Michael Heinrich's problem of
http://mid.gmane.org/6zr42uxtf5.fsf@elektra.science-computing.de ,
introduced by Ben's patch of
https://bitbucket.org/xemacs/xemacs/commits/047d37eb70d70f43803 .
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Tue, 17 Jun 2014 20:55:45 +0100 |
parents | 308d34e9f07d |
children |
rev | line source |
---|---|
428 | 1 /* XEmacs routines to deal with range tables. |
2 Copyright (C) 1995 Sun Microsystems, Inc. | |
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5127
diff
changeset
|
3 Copyright (C) 1995, 2004, 2010 Ben Wing. |
428 | 4 |
5 This file is part of XEmacs. | |
6 | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5168
diff
changeset
|
7 XEmacs is free software: you can redistribute it and/or modify it |
428 | 8 under the terms of the GNU General Public License as published by the |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5168
diff
changeset
|
9 Free Software Foundation, either version 3 of the License, or (at your |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5168
diff
changeset
|
10 option) any later version. |
428 | 11 |
12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
15 for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5168
diff
changeset
|
18 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
428 | 19 |
20 /* Synched up with: Not in FSF. */ | |
21 | |
22 /* Extracted from rangetab.c by O. Galibert, 1998. */ | |
23 | |
440 | 24 #ifndef INCLUDED_rangetab_h_ |
25 #define INCLUDED_rangetab_h_ | |
428 | 26 |
27 typedef struct range_table_entry range_table_entry; | |
28 struct range_table_entry | |
29 { | |
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5127
diff
changeset
|
30 #ifdef NEW_GC |
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5127
diff
changeset
|
31 NORMAL_LISP_OBJECT_HEADER header; |
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5127
diff
changeset
|
32 #endif /* NEW_GC */ |
428 | 33 EMACS_INT first; |
34 EMACS_INT last; | |
35 Lisp_Object val; | |
36 }; | |
37 | |
38 typedef struct | |
39 { | |
40 Dynarr_declare (range_table_entry); | |
41 } range_table_entry_dynarr; | |
42 | |
2421 | 43 enum range_table_type |
44 { | |
45 RANGE_START_CLOSED_END_OPEN, | |
46 RANGE_START_CLOSED_END_CLOSED, | |
47 RANGE_START_OPEN_END_CLOSED, | |
48 RANGE_START_OPEN_END_OPEN | |
49 }; | |
50 | |
428 | 51 struct Lisp_Range_Table |
52 { | |
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
53 NORMAL_LISP_OBJECT_HEADER header; |
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5127
diff
changeset
|
54 Gap_Array *entries; |
2421 | 55 enum range_table_type type; |
428 | 56 }; |
440 | 57 typedef struct Lisp_Range_Table Lisp_Range_Table; |
428 | 58 |
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
59 DECLARE_LISP_OBJECT (range_table, Lisp_Range_Table); |
440 | 60 #define XRANGE_TABLE(x) XRECORD (x, range_table, Lisp_Range_Table) |
617 | 61 #define wrap_range_table(p) wrap_record (p, range_table) |
428 | 62 #define RANGE_TABLEP(x) RECORDP (x, range_table) |
63 #define CHECK_RANGE_TABLE(x) CHECK_RECORD (x, range_table) | |
64 | |
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5127
diff
changeset
|
65 #define rangetab_gap_array_at(ga, pos) \ |
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5127
diff
changeset
|
66 gap_array_at (ga, pos, struct range_table_entry) |
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5127
diff
changeset
|
67 #define rangetab_gap_array_atp(ga, pos) \ |
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5127
diff
changeset
|
68 gap_array_atp (ga, pos, struct range_table_entry) |
440 | 69 #endif /* INCLUDED_rangetab_h_ */ |