Mercurial > emacs
annotate src/textprop.c @ 112438:11f1b4757236
* image.c (x_create_bitmap_from_xpm_data): Add cast to fix type clash
when calling XpmCreatePixmapFromData.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Sat, 22 Jan 2011 20:33:12 -0800 |
parents | 42e22c4f06b7 |
children |
rev | line source |
---|---|
1029 | 1 /* Interface code for dealing with text properties. |
64770
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64576
diff
changeset
|
2 Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, |
112218
376148b31b5e
Add 2011 to FSF/AIST copyright years.
Glenn Morris <rgm@gnu.org>
parents:
106906
diff
changeset
|
3 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
1029 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
7 GNU Emacs is free software: you can redistribute it and/or modify |
1029 | 8 it under the terms of the GNU General Public License as published by |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
9 the Free Software Foundation, either version 3 of the License, or |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
10 (at your option) any later version. |
1029 | 11 |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
1029 | 19 |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4649
diff
changeset
|
20 #include <config.h> |
105669
68dd71358159
* alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100951
diff
changeset
|
21 #include <setjmp.h> |
1029 | 22 #include "lisp.h" |
23 #include "intervals.h" | |
24 #include "buffer.h" | |
6063
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
25 #include "window.h" |
8962
722763fed8ce
(Fget_char_property): Pass new arg to overlays_at.
Richard M. Stallman <rms@gnu.org>
parents:
8907
diff
changeset
|
26 |
722763fed8ce
(Fget_char_property): Pass new arg to overlays_at.
Richard M. Stallman <rms@gnu.org>
parents:
8907
diff
changeset
|
27 #ifndef NULL |
722763fed8ce
(Fget_char_property): Pass new arg to overlays_at.
Richard M. Stallman <rms@gnu.org>
parents:
8907
diff
changeset
|
28 #define NULL (void *)0 |
722763fed8ce
(Fget_char_property): Pass new arg to overlays_at.
Richard M. Stallman <rms@gnu.org>
parents:
8907
diff
changeset
|
29 #endif |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
30 |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
31 /* Test for membership, allowing for t (actually any non-cons) to mean the |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
32 universal set. */ |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
33 |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
34 #define TMEM(sym, set) (CONSP (set) ? ! NILP (Fmemq (sym, set)) : ! NILP (set)) |
1029 | 35 |
36 | |
37 /* NOTES: previous- and next- property change will have to skip | |
38 zero-length intervals if they are implemented. This could be done | |
39 inside next_interval and previous_interval. | |
40 | |
1211 | 41 set_properties needs to deal with the interval property cache. |
42 | |
1029 | 43 It is assumed that for any interval plist, a property appears |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
44 only once on the list. Although some code i.e., remove_properties, |
1029 | 45 handles the more general case, the uniqueness of properties is |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3553
diff
changeset
|
46 necessary for the system to remain consistent. This requirement |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
47 is enforced by the subrs installing properties onto the intervals. */ |
1029 | 48 |
49 | |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
50 /* Types of hooks. */ |
1029 | 51 Lisp_Object Qmouse_left; |
52 Lisp_Object Qmouse_entered; | |
53 Lisp_Object Qpoint_left; | |
54 Lisp_Object Qpoint_entered; | |
2058
a43d0bb1b7d8
(Fget_text_property): Use textget.
Richard M. Stallman <rms@gnu.org>
parents:
2053
diff
changeset
|
55 Lisp_Object Qcategory; |
a43d0bb1b7d8
(Fget_text_property): Use textget.
Richard M. Stallman <rms@gnu.org>
parents:
2053
diff
changeset
|
56 Lisp_Object Qlocal_map; |
1029 | 57 |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
58 /* Visual properties text (including strings) may have. */ |
1029 | 59 Lisp_Object Qforeground, Qbackground, Qfont, Qunderline, Qstipple; |
23729
cf1cbb0e5d5b
(Qmouse_face): Variable definition moved here.
Richard M. Stallman <rms@gnu.org>
parents:
22344
diff
changeset
|
60 Lisp_Object Qinvisible, Qread_only, Qintangible, Qmouse_face; |
100688
8233f3e2beb4
* textprop.c (Qminibuffer_prompt): New variable.
Martin Rudalics <rudalics@gmx.at>
parents:
99343
diff
changeset
|
61 Lisp_Object Qminibuffer_prompt; |
4381
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
62 |
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
63 /* Sticky properties */ |
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
64 Lisp_Object Qfront_sticky, Qrear_nonsticky; |
3960
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
65 |
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
66 /* If o1 is a cons whose cdr is a cons, return non-zero and set o2 to |
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
67 the o1's cdr. Otherwise, return zero. This is handy for |
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
68 traversing plists. */ |
25645
a14111a2a100
Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25000
diff
changeset
|
69 #define PLIST_ELT_P(o1, o2) (CONSP (o1) && ((o2)=XCDR (o1), CONSP (o2))) |
3960
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
70 |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
71 /* verify_interval_modification saves insertion hooks here |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
72 to be run later by report_interval_modification. */ |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
73 Lisp_Object interval_insert_behind_hooks; |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
74 Lisp_Object interval_insert_in_front_hooks; |
33952
ca22422634ac
(text_read_only): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32849
diff
changeset
|
75 |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106906
diff
changeset
|
76 static void text_read_only (Lisp_Object) NO_RETURN; |
72005
da0099bc0ba4
* ebrowse.c (usage, version): Mark as NO_RETURN.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
71989
diff
changeset
|
77 |
33952
ca22422634ac
(text_read_only): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32849
diff
changeset
|
78 |
ca22422634ac
(text_read_only): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32849
diff
changeset
|
79 /* Signal a `text-read-only' error. This function makes it easier |
ca22422634ac
(text_read_only): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32849
diff
changeset
|
80 to capture that error in GDB by putting a breakpoint on it. */ |
ca22422634ac
(text_read_only): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32849
diff
changeset
|
81 |
ca22422634ac
(text_read_only): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32849
diff
changeset
|
82 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
83 text_read_only (Lisp_Object propval) |
33952
ca22422634ac
(text_read_only): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32849
diff
changeset
|
84 { |
71989
3a19c23d7c59
(text_read_only): Use xsignal0, xsignal1.
Kim F. Storm <storm@cua.dk>
parents:
71575
diff
changeset
|
85 if (STRINGP (propval)) |
3a19c23d7c59
(text_read_only): Use xsignal0, xsignal1.
Kim F. Storm <storm@cua.dk>
parents:
71575
diff
changeset
|
86 xsignal1 (Qtext_read_only, propval); |
3a19c23d7c59
(text_read_only): Use xsignal0, xsignal1.
Kim F. Storm <storm@cua.dk>
parents:
71575
diff
changeset
|
87 |
3a19c23d7c59
(text_read_only): Use xsignal0, xsignal1.
Kim F. Storm <storm@cua.dk>
parents:
71575
diff
changeset
|
88 xsignal0 (Qtext_read_only); |
33952
ca22422634ac
(text_read_only): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32849
diff
changeset
|
89 } |
ca22422634ac
(text_read_only): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32849
diff
changeset
|
90 |
ca22422634ac
(text_read_only): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32849
diff
changeset
|
91 |
1029 | 92 |
1055 | 93 /* Extract the interval at the position pointed to by BEGIN from |
94 OBJECT, a string or buffer. Additionally, check that the positions | |
95 pointed to by BEGIN and END are within the bounds of OBJECT, and | |
96 reverse them if *BEGIN is greater than *END. The objects pointed | |
97 to by BEGIN and END may be integers or markers; if the latter, they | |
98 are coerced to integers. | |
1029 | 99 |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
100 When OBJECT is a string, we increment *BEGIN and *END |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
101 to make them origin-one. |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
102 |
1029 | 103 Note that buffer points don't correspond to interval indices. |
104 For example, point-max is 1 greater than the index of the last | |
105 character. This difference is handled in the caller, which uses | |
106 the validated points to determine a length, and operates on that. | |
107 Exceptions are Ftext_properties_at, Fnext_property_change, and | |
108 Fprevious_property_change which call this function with BEGIN == END. | |
109 Handle this case specially. | |
110 | |
111 If FORCE is soft (0), it's OK to return NULL_INTERVAL. Otherwise, | |
1055 | 112 create an interval tree for OBJECT if one doesn't exist, provided |
113 the object actually contains text. In the current design, if there | |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
114 is no text, there can be no text properties. */ |
1029 | 115 |
116 #define soft 0 | |
117 #define hard 1 | |
118 | |
25000 | 119 INTERVAL |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
120 validate_interval_range (Lisp_Object object, Lisp_Object *begin, Lisp_Object *end, int force) |
1029 | 121 { |
122 register INTERVAL i; | |
110564
08d10ad776d8
Fix int/EMACS_INT use in textprop.c and window.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109179
diff
changeset
|
123 EMACS_INT searchpos; |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
124 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40647
diff
changeset
|
125 CHECK_STRING_OR_BUFFER (object); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40647
diff
changeset
|
126 CHECK_NUMBER_COERCE_MARKER (*begin); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40647
diff
changeset
|
127 CHECK_NUMBER_COERCE_MARKER (*end); |
1029 | 128 |
129 /* If we are asked for a point, but from a subr which operates | |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
130 on a range, then return nothing. */ |
8907
f7de8b4cb1b8
(validate_interval_range, property_value, Fget_char_property,
Karl Heuer <kwzh@gnu.org>
parents:
8856
diff
changeset
|
131 if (EQ (*begin, *end) && begin != end) |
1029 | 132 return NULL_INTERVAL; |
133 | |
134 if (XINT (*begin) > XINT (*end)) | |
135 { | |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
136 Lisp_Object n; |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
137 n = *begin; |
1029 | 138 *begin = *end; |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
139 *end = n; |
1029 | 140 } |
141 | |
9109
6e44ddc40153
(validate_interval_range, add_properties, remove_properties,
Karl Heuer <kwzh@gnu.org>
parents:
9071
diff
changeset
|
142 if (BUFFERP (object)) |
1029 | 143 { |
144 register struct buffer *b = XBUFFER (object); | |
145 | |
146 if (!(BUF_BEGV (b) <= XINT (*begin) && XINT (*begin) <= XINT (*end) | |
147 && XINT (*end) <= BUF_ZV (b))) | |
148 args_out_of_range (*begin, *end); | |
10312
4bf079c613c6
(validate_interval_range): Use BUF_INTERVALS.
Richard M. Stallman <rms@gnu.org>
parents:
10159
diff
changeset
|
149 i = BUF_INTERVALS (b); |
1029 | 150 |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
151 /* If there's no text, there are no properties. */ |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
152 if (BUF_BEGV (b) == BUF_ZV (b)) |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
153 return NULL_INTERVAL; |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
154 |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
155 searchpos = XINT (*begin); |
1029 | 156 } |
157 else | |
158 { | |
110564
08d10ad776d8
Fix int/EMACS_INT use in textprop.c and window.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109179
diff
changeset
|
159 EMACS_INT len = SCHARS (object); |
1029 | 160 |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
161 if (! (0 <= XINT (*begin) && XINT (*begin) <= XINT (*end) |
46448
218b99308569
(validate_interval_range, interval_of): Use string macros instead of
Ken Raeburn <raeburn@raeburn.org>
parents:
46381
diff
changeset
|
162 && XINT (*end) <= len)) |
1029 | 163 args_out_of_range (*begin, *end); |
22344
2ec50b4767ed
Handle the new convention that `position' values
Karl Heuer <kwzh@gnu.org>
parents:
22280
diff
changeset
|
164 XSETFASTINT (*begin, XFASTINT (*begin)); |
3996
b9bdcf862c67
* textprop.c (validate_interval_range): Don't increment both
Jim Blandy <jimb@redhat.com>
parents:
3960
diff
changeset
|
165 if (begin != end) |
22344
2ec50b4767ed
Handle the new convention that `position' values
Karl Heuer <kwzh@gnu.org>
parents:
22280
diff
changeset
|
166 XSETFASTINT (*end, XFASTINT (*end)); |
46448
218b99308569
(validate_interval_range, interval_of): Use string macros instead of
Ken Raeburn <raeburn@raeburn.org>
parents:
46381
diff
changeset
|
167 i = STRING_INTERVALS (object); |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
168 |
46448
218b99308569
(validate_interval_range, interval_of): Use string macros instead of
Ken Raeburn <raeburn@raeburn.org>
parents:
46381
diff
changeset
|
169 if (len == 0) |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
170 return NULL_INTERVAL; |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
171 |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
172 searchpos = XINT (*begin); |
1029 | 173 } |
174 | |
175 if (NULL_INTERVAL_P (i)) | |
176 return (force ? create_root_interval (object) : i); | |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
177 |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
178 return find_interval (i, searchpos); |
1029 | 179 } |
180 | |
181 /* Validate LIST as a property list. If LIST is not a list, then | |
182 make one consisting of (LIST nil). Otherwise, verify that LIST | |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
183 is even numbered and thus suitable as a plist. */ |
1029 | 184 |
185 static Lisp_Object | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
186 validate_plist (Lisp_Object list) |
1029 | 187 { |
188 if (NILP (list)) | |
189 return Qnil; | |
190 | |
191 if (CONSP (list)) | |
192 { | |
193 register int i; | |
194 register Lisp_Object tail; | |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
195 for (i = 0, tail = list; CONSP (tail); i++) |
3996
b9bdcf862c67
* textprop.c (validate_interval_range): Don't increment both
Jim Blandy <jimb@redhat.com>
parents:
3960
diff
changeset
|
196 { |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
197 tail = XCDR (tail); |
3996
b9bdcf862c67
* textprop.c (validate_interval_range): Don't increment both
Jim Blandy <jimb@redhat.com>
parents:
3960
diff
changeset
|
198 QUIT; |
b9bdcf862c67
* textprop.c (validate_interval_range): Don't increment both
Jim Blandy <jimb@redhat.com>
parents:
3960
diff
changeset
|
199 } |
1029 | 200 if (i & 1) |
201 error ("Odd length text property list"); | |
202 return list; | |
203 } | |
204 | |
205 return Fcons (list, Fcons (Qnil, Qnil)); | |
206 } | |
207 | |
208 /* Return nonzero if interval I has all the properties, | |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
209 with the same values, of list PLIST. */ |
1029 | 210 |
211 static int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
212 interval_has_all_properties (Lisp_Object plist, INTERVAL i) |
1029 | 213 { |
25772
1902e7e63fa7
(Fset_text_properties): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25645
diff
changeset
|
214 register Lisp_Object tail1, tail2, sym1; |
1029 | 215 register int found; |
216 | |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
217 /* Go through each element of PLIST. */ |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
218 for (tail1 = plist; CONSP (tail1); tail1 = Fcdr (XCDR (tail1))) |
1029 | 219 { |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
220 sym1 = XCAR (tail1); |
1029 | 221 found = 0; |
222 | |
223 /* Go through I's plist, looking for sym1 */ | |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
224 for (tail2 = i->plist; CONSP (tail2); tail2 = Fcdr (XCDR (tail2))) |
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
225 if (EQ (sym1, XCAR (tail2))) |
1029 | 226 { |
227 /* Found the same property on both lists. If the | |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
228 values are unequal, return zero. */ |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
229 if (! EQ (Fcar (XCDR (tail1)), Fcar (XCDR (tail2)))) |
1029 | 230 return 0; |
231 | |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
232 /* Property has same value on both lists; go to next one. */ |
1029 | 233 found = 1; |
234 break; | |
235 } | |
236 | |
237 if (! found) | |
238 return 0; | |
239 } | |
240 | |
241 return 1; | |
242 } | |
243 | |
244 /* Return nonzero if the plist of interval I has any of the | |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
245 properties of PLIST, regardless of their values. */ |
1029 | 246 |
247 static INLINE int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
248 interval_has_some_properties (Lisp_Object plist, INTERVAL i) |
1029 | 249 { |
250 register Lisp_Object tail1, tail2, sym; | |
251 | |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
252 /* Go through each element of PLIST. */ |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
253 for (tail1 = plist; CONSP (tail1); tail1 = Fcdr (XCDR (tail1))) |
1029 | 254 { |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
255 sym = XCAR (tail1); |
1029 | 256 |
257 /* Go through i's plist, looking for tail1 */ | |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
258 for (tail2 = i->plist; CONSP (tail2); tail2 = Fcdr (XCDR (tail2))) |
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
259 if (EQ (sym, XCAR (tail2))) |
1029 | 260 return 1; |
261 } | |
262 | |
263 return 0; | |
264 } | |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
265 |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
266 /* Return nonzero if the plist of interval I has any of the |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
267 property names in LIST, regardless of their values. */ |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
268 |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
269 static INLINE int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
270 interval_has_some_properties_list (Lisp_Object list, INTERVAL i) |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
271 { |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
272 register Lisp_Object tail1, tail2, sym; |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
273 |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
274 /* Go through each element of LIST. */ |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
275 for (tail1 = list; CONSP (tail1); tail1 = XCDR (tail1)) |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
276 { |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
277 sym = Fcar (tail1); |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
278 |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
279 /* Go through i's plist, looking for tail1 */ |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
280 for (tail2 = i->plist; CONSP (tail2); tail2 = XCDR (XCDR (tail2))) |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
281 if (EQ (sym, XCAR (tail2))) |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
282 return 1; |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
283 } |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
284 |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
285 return 0; |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
286 } |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
287 |
3960
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
288 /* Changing the plists of individual intervals. */ |
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
289 |
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
290 /* Return the value of PROP in property-list PLIST, or Qunbound if it |
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
291 has none. */ |
8907
f7de8b4cb1b8
(validate_interval_range, property_value, Fget_char_property,
Karl Heuer <kwzh@gnu.org>
parents:
8856
diff
changeset
|
292 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
293 property_value (Lisp_Object plist, Lisp_Object prop) |
3960
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
294 { |
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
295 Lisp_Object value; |
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
296 |
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
297 while (PLIST_ELT_P (plist, value)) |
25645
a14111a2a100
Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25000
diff
changeset
|
298 if (EQ (XCAR (plist), prop)) |
a14111a2a100
Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25000
diff
changeset
|
299 return XCAR (value); |
3960
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
300 else |
25645
a14111a2a100
Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25000
diff
changeset
|
301 plist = XCDR (value); |
3960
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
302 |
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
303 return Qunbound; |
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
304 } |
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
305 |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
306 /* Set the properties of INTERVAL to PROPERTIES, |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
307 and record undo info for the previous values. |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
308 OBJECT is the string or buffer that INTERVAL belongs to. */ |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
309 |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
310 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
311 set_properties (Lisp_Object properties, INTERVAL interval, Lisp_Object object) |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
312 { |
3960
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
313 Lisp_Object sym, value; |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
314 |
3960
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
315 if (BUFFERP (object)) |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
316 { |
3960
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
317 /* For each property in the old plist which is missing from PROPERTIES, |
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
318 or has a different value in PROPERTIES, make an undo record. */ |
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
319 for (sym = interval->plist; |
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
320 PLIST_ELT_P (sym, value); |
25645
a14111a2a100
Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25000
diff
changeset
|
321 sym = XCDR (value)) |
a14111a2a100
Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25000
diff
changeset
|
322 if (! EQ (property_value (properties, XCAR (sym)), |
a14111a2a100
Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25000
diff
changeset
|
323 XCAR (value))) |
4076
9fd5ecacfbbb
(Qinsert_in_front_hooks, Qinsert_behind_hooks): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4007
diff
changeset
|
324 { |
9fd5ecacfbbb
(Qinsert_in_front_hooks, Qinsert_behind_hooks): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4007
diff
changeset
|
325 record_property_change (interval->position, LENGTH (interval), |
25645
a14111a2a100
Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25000
diff
changeset
|
326 XCAR (sym), XCAR (value), |
4076
9fd5ecacfbbb
(Qinsert_in_front_hooks, Qinsert_behind_hooks): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4007
diff
changeset
|
327 object); |
9fd5ecacfbbb
(Qinsert_in_front_hooks, Qinsert_behind_hooks): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4007
diff
changeset
|
328 } |
3960
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
329 |
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
330 /* For each new property that has no value at all in the old plist, |
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
331 make an undo record binding it to nil, so it will be removed. */ |
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
332 for (sym = properties; |
7be89f84a882
* textprop.c (set_properties): Add undo records to remove entirely
Jim Blandy <jimb@redhat.com>
parents:
3858
diff
changeset
|
333 PLIST_ELT_P (sym, value); |
25645
a14111a2a100
Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25000
diff
changeset
|
334 sym = XCDR (value)) |
a14111a2a100
Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25000
diff
changeset
|
335 if (EQ (property_value (interval->plist, XCAR (sym)), Qunbound)) |
4076
9fd5ecacfbbb
(Qinsert_in_front_hooks, Qinsert_behind_hooks): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4007
diff
changeset
|
336 { |
9fd5ecacfbbb
(Qinsert_in_front_hooks, Qinsert_behind_hooks): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4007
diff
changeset
|
337 record_property_change (interval->position, LENGTH (interval), |
25645
a14111a2a100
Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25000
diff
changeset
|
338 XCAR (sym), Qnil, |
4076
9fd5ecacfbbb
(Qinsert_in_front_hooks, Qinsert_behind_hooks): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4007
diff
changeset
|
339 object); |
9fd5ecacfbbb
(Qinsert_in_front_hooks, Qinsert_behind_hooks): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4007
diff
changeset
|
340 } |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
341 } |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
342 |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
343 /* Store new properties. */ |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
344 interval->plist = Fcopy_sequence (properties); |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
345 } |
1029 | 346 |
347 /* Add the properties of PLIST to the interval I, or set | |
348 the value of I's property to the value of the property on PLIST | |
349 if they are different. | |
350 | |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
351 OBJECT should be the string or buffer the interval is in. |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
352 |
1029 | 353 Return nonzero if this changes I (i.e., if any members of PLIST |
354 are actually added to I's plist) */ | |
355 | |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
356 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
357 add_properties (Lisp_Object plist, INTERVAL i, Lisp_Object object) |
1029 | 358 { |
10159
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
359 Lisp_Object tail1, tail2, sym1, val1; |
1029 | 360 register int changed = 0; |
361 register int found; | |
10159
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
362 struct gcpro gcpro1, gcpro2, gcpro3; |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
363 |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
364 tail1 = plist; |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
365 sym1 = Qnil; |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
366 val1 = Qnil; |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
367 /* No need to protect OBJECT, because we can GC only in the case |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
368 where it is a buffer, and live buffers are always protected. |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
369 I and its plist are also protected, via OBJECT. */ |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
370 GCPRO3 (tail1, sym1, val1); |
1029 | 371 |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
372 /* Go through each element of PLIST. */ |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
373 for (tail1 = plist; CONSP (tail1); tail1 = Fcdr (XCDR (tail1))) |
1029 | 374 { |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
375 sym1 = XCAR (tail1); |
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
376 val1 = Fcar (XCDR (tail1)); |
1029 | 377 found = 0; |
378 | |
379 /* Go through I's plist, looking for sym1 */ | |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
380 for (tail2 = i->plist; CONSP (tail2); tail2 = Fcdr (XCDR (tail2))) |
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
381 if (EQ (sym1, XCAR (tail2))) |
1029 | 382 { |
10159
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
383 /* No need to gcpro, because tail2 protects this |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
384 and it must be a cons cell (we get an error otherwise). */ |
6516
8278049ee7a7
(add_properties, remove_properties): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6064
diff
changeset
|
385 register Lisp_Object this_cdr; |
1029 | 386 |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
387 this_cdr = XCDR (tail2); |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
388 /* Found the property. Now check its value. */ |
1029 | 389 found = 1; |
390 | |
391 /* The properties have the same value on both lists. | |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
392 Continue to the next property. */ |
3998
c0560357c84e
Compare the values of text properties using EQ, not Fequal.
Jim Blandy <jimb@redhat.com>
parents:
3996
diff
changeset
|
393 if (EQ (val1, Fcar (this_cdr))) |
1029 | 394 break; |
395 | |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
396 /* Record this change in the buffer, for undo purposes. */ |
9109
6e44ddc40153
(validate_interval_range, add_properties, remove_properties,
Karl Heuer <kwzh@gnu.org>
parents:
9071
diff
changeset
|
397 if (BUFFERP (object)) |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
398 { |
4076
9fd5ecacfbbb
(Qinsert_in_front_hooks, Qinsert_behind_hooks): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4007
diff
changeset
|
399 record_property_change (i->position, LENGTH (i), |
9fd5ecacfbbb
(Qinsert_in_front_hooks, Qinsert_behind_hooks): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4007
diff
changeset
|
400 sym1, Fcar (this_cdr), object); |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
401 } |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
402 |
1029 | 403 /* I's property has a different value -- change it */ |
404 Fsetcar (this_cdr, val1); | |
405 changed++; | |
406 break; | |
407 } | |
408 | |
409 if (! found) | |
410 { | |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
411 /* Record this change in the buffer, for undo purposes. */ |
9109
6e44ddc40153
(validate_interval_range, add_properties, remove_properties,
Karl Heuer <kwzh@gnu.org>
parents:
9071
diff
changeset
|
412 if (BUFFERP (object)) |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
413 { |
4076
9fd5ecacfbbb
(Qinsert_in_front_hooks, Qinsert_behind_hooks): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4007
diff
changeset
|
414 record_property_change (i->position, LENGTH (i), |
9fd5ecacfbbb
(Qinsert_in_front_hooks, Qinsert_behind_hooks): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
4007
diff
changeset
|
415 sym1, Qnil, object); |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
416 } |
1029 | 417 i->plist = Fcons (sym1, Fcons (val1, i->plist)); |
418 changed++; | |
419 } | |
420 } | |
421 | |
10159
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
422 UNGCPRO; |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
423 |
1029 | 424 return changed; |
425 } | |
426 | |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
427 /* For any members of PLIST, or LIST, |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
428 which are properties of I, remove them from I's plist. |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
429 (If PLIST is non-nil, use that, otherwise use LIST.) |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
430 OBJECT is the string or buffer containing I. */ |
1029 | 431 |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
432 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
433 remove_properties (Lisp_Object plist, Lisp_Object list, INTERVAL i, Lisp_Object object) |
1029 | 434 { |
6516
8278049ee7a7
(add_properties, remove_properties): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6064
diff
changeset
|
435 register Lisp_Object tail1, tail2, sym, current_plist; |
1029 | 436 register int changed = 0; |
437 | |
44748
e137c1849517
(remove_properties): Fixed trap for malformed plist.
Kim F. Storm <storm@cua.dk>
parents:
44673
diff
changeset
|
438 /* Nonzero means tail1 is a plist, otherwise it is a list. */ |
e137c1849517
(remove_properties): Fixed trap for malformed plist.
Kim F. Storm <storm@cua.dk>
parents:
44673
diff
changeset
|
439 int use_plist; |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
440 |
6516
8278049ee7a7
(add_properties, remove_properties): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6064
diff
changeset
|
441 current_plist = i->plist; |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
442 |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
443 if (! NILP (plist)) |
44748
e137c1849517
(remove_properties): Fixed trap for malformed plist.
Kim F. Storm <storm@cua.dk>
parents:
44673
diff
changeset
|
444 tail1 = plist, use_plist = 1; |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
445 else |
44748
e137c1849517
(remove_properties): Fixed trap for malformed plist.
Kim F. Storm <storm@cua.dk>
parents:
44673
diff
changeset
|
446 tail1 = list, use_plist = 0; |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
447 |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
448 /* Go through each element of LIST or PLIST. */ |
44976
b8a7a7d6e18a
(remove_properties): Don't use XCAR without CONSP.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44748
diff
changeset
|
449 while (CONSP (tail1)) |
1029 | 450 { |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
451 sym = XCAR (tail1); |
1029 | 452 |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
453 /* First, remove the symbol if it's at the head of the list */ |
44976
b8a7a7d6e18a
(remove_properties): Don't use XCAR without CONSP.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44748
diff
changeset
|
454 while (CONSP (current_plist) && EQ (sym, XCAR (current_plist))) |
1029 | 455 { |
9109
6e44ddc40153
(validate_interval_range, add_properties, remove_properties,
Karl Heuer <kwzh@gnu.org>
parents:
9071
diff
changeset
|
456 if (BUFFERP (object)) |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
457 record_property_change (i->position, LENGTH (i), |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
458 sym, XCAR (XCDR (current_plist)), |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
459 object); |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
460 |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
461 current_plist = XCDR (XCDR (current_plist)); |
1029 | 462 changed++; |
463 } | |
464 | |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
465 /* Go through I's plist, looking for SYM. */ |
1029 | 466 tail2 = current_plist; |
467 while (! NILP (tail2)) | |
468 { | |
6516
8278049ee7a7
(add_properties, remove_properties): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents:
6064
diff
changeset
|
469 register Lisp_Object this; |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
470 this = XCDR (XCDR (tail2)); |
44976
b8a7a7d6e18a
(remove_properties): Don't use XCAR without CONSP.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44748
diff
changeset
|
471 if (CONSP (this) && EQ (sym, XCAR (this))) |
1029 | 472 { |
9109
6e44ddc40153
(validate_interval_range, add_properties, remove_properties,
Karl Heuer <kwzh@gnu.org>
parents:
9071
diff
changeset
|
473 if (BUFFERP (object)) |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
474 record_property_change (i->position, LENGTH (i), |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
475 sym, XCAR (XCDR (this)), object); |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
476 |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
477 Fsetcdr (XCDR (tail2), XCDR (XCDR (this))); |
1029 | 478 changed++; |
479 } | |
480 tail2 = this; | |
481 } | |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
482 |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
483 /* Advance thru TAIL1 one way or the other. */ |
44748
e137c1849517
(remove_properties): Fixed trap for malformed plist.
Kim F. Storm <storm@cua.dk>
parents:
44673
diff
changeset
|
484 tail1 = XCDR (tail1); |
e137c1849517
(remove_properties): Fixed trap for malformed plist.
Kim F. Storm <storm@cua.dk>
parents:
44673
diff
changeset
|
485 if (use_plist && CONSP (tail1)) |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
486 tail1 = XCDR (tail1); |
1029 | 487 } |
488 | |
489 if (changed) | |
490 i->plist = current_plist; | |
491 return changed; | |
492 } | |
493 | |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
494 #if 0 |
1029 | 495 /* Remove all properties from interval I. Return non-zero |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
496 if this changes the interval. */ |
1029 | 497 |
498 static INLINE int | |
112021 | 499 erase_properties (INTERVAL i) |
1029 | 500 { |
501 if (NILP (i->plist)) | |
502 return 0; | |
503 | |
504 i->plist = Qnil; | |
505 return 1; | |
506 } | |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
507 #endif |
1029 | 508 |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
509 /* Returns the interval of POSITION in OBJECT. |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
510 POSITION is BEG-based. */ |
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
511 |
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
512 INTERVAL |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
513 interval_of (int position, Lisp_Object object) |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
514 { |
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
515 register INTERVAL i; |
110564
08d10ad776d8
Fix int/EMACS_INT use in textprop.c and window.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109179
diff
changeset
|
516 EMACS_INT beg, end; |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
517 |
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
518 if (NILP (object)) |
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
519 XSETBUFFER (object, current_buffer); |
20955 | 520 else if (EQ (object, Qt)) |
521 return NULL_INTERVAL; | |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
522 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40647
diff
changeset
|
523 CHECK_STRING_OR_BUFFER (object); |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
524 |
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
525 if (BUFFERP (object)) |
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
526 { |
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
527 register struct buffer *b = XBUFFER (object); |
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
528 |
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
529 beg = BUF_BEGV (b); |
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
530 end = BUF_ZV (b); |
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
531 i = BUF_INTERVALS (b); |
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
532 } |
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
533 else |
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
534 { |
22344
2ec50b4767ed
Handle the new convention that `position' values
Karl Heuer <kwzh@gnu.org>
parents:
22280
diff
changeset
|
535 beg = 0; |
46448
218b99308569
(validate_interval_range, interval_of): Use string macros instead of
Ken Raeburn <raeburn@raeburn.org>
parents:
46381
diff
changeset
|
536 end = SCHARS (object); |
218b99308569
(validate_interval_range, interval_of): Use string macros instead of
Ken Raeburn <raeburn@raeburn.org>
parents:
46381
diff
changeset
|
537 i = STRING_INTERVALS (object); |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
538 } |
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
539 |
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
540 if (!(beg <= position && position <= end)) |
18736
e5e6647d4883
(interval_of): Convert args_out_of_range arguments to Lisp_Integer.
Richard M. Stallman <rms@gnu.org>
parents:
18613
diff
changeset
|
541 args_out_of_range (make_number (position), make_number (position)); |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
542 if (beg == end || NULL_INTERVAL_P (i)) |
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
543 return NULL_INTERVAL; |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
544 |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
545 return find_interval (i, position); |
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
546 } |
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
547 |
1029 | 548 DEFUN ("text-properties-at", Ftext_properties_at, |
549 Stext_properties_at, 1, 2, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
550 doc: /* Return the list of properties of the character at POSITION in OBJECT. |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
551 If the optional second argument OBJECT is a buffer (or nil, which means |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
552 the current buffer), POSITION is a buffer position (integer or marker). |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
553 If OBJECT is a string, POSITION is a 0-based index into it. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
554 If POSITION is at the end of OBJECT, the value is nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
555 (Lisp_Object position, Lisp_Object object) |
1029 | 556 { |
557 register INTERVAL i; | |
558 | |
559 if (NILP (object)) | |
9280
4b238c43e59f
(Ftext_properties_at, Fget_char_property, Fnext_property_change,
Karl Heuer <kwzh@gnu.org>
parents:
9109
diff
changeset
|
560 XSETBUFFER (object, current_buffer); |
1029 | 561 |
14088
dc754f92a2a4
(Ftext_properties_at, Fget_text_property, Fget_char_property,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
562 i = validate_interval_range (object, &position, &position, soft); |
1029 | 563 if (NULL_INTERVAL_P (i)) |
564 return Qnil; | |
14088
dc754f92a2a4
(Ftext_properties_at, Fget_text_property, Fget_char_property,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
565 /* If POSITION is at the end of the interval, |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
566 it means it's the end of OBJECT. |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
567 There are no properties at the very end, |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
568 since no character follows. */ |
14088
dc754f92a2a4
(Ftext_properties_at, Fget_text_property, Fget_char_property,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
569 if (XINT (position) == LENGTH (i) + i->position) |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
570 return Qnil; |
1029 | 571 |
572 return i->plist; | |
573 } | |
574 | |
1857
9d65dfc7bdb7
(Fadd_text_properties): Put OBJECT arg last. Make it optional.
Richard M. Stallman <rms@gnu.org>
parents:
1715
diff
changeset
|
575 DEFUN ("get-text-property", Fget_text_property, Sget_text_property, 2, 3, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
576 doc: /* Return the value of POSITION's property PROP, in OBJECT. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
577 OBJECT is optional and defaults to the current buffer. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
578 If POSITION is at the end of OBJECT, the value is nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
579 (Lisp_Object position, Lisp_Object prop, Lisp_Object object) |
1857
9d65dfc7bdb7
(Fadd_text_properties): Put OBJECT arg last. Make it optional.
Richard M. Stallman <rms@gnu.org>
parents:
1715
diff
changeset
|
580 { |
14088
dc754f92a2a4
(Ftext_properties_at, Fget_text_property, Fget_char_property,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
581 return textget (Ftext_properties_at (position, object), prop); |
1857
9d65dfc7bdb7
(Fadd_text_properties): Put OBJECT arg last. Make it optional.
Richard M. Stallman <rms@gnu.org>
parents:
1715
diff
changeset
|
582 } |
9d65dfc7bdb7
(Fadd_text_properties): Put OBJECT arg last. Make it optional.
Richard M. Stallman <rms@gnu.org>
parents:
1715
diff
changeset
|
583 |
48840
b6981c46191d
(text_read_only): New arg `propval'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46448
diff
changeset
|
584 /* Return the value of char's property PROP, in OBJECT at POSITION. |
32849
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
585 OBJECT is optional and defaults to the current buffer. |
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
586 If OVERLAY is non-0, then in the case that the returned property is from |
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
587 an overlay, the overlay found is returned in *OVERLAY, otherwise nil is |
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
588 returned in *OVERLAY. |
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
589 If POSITION is at the end of OBJECT, the value is nil. |
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
590 If OBJECT is a buffer, then overlay properties are considered as well as |
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
591 text properties. |
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
592 If OBJECT is a window, then that window's buffer is used, but |
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
593 window-specific overlays are considered only if they are associated |
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
594 with OBJECT. */ |
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
595 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
596 get_char_property_and_overlay (Lisp_Object position, register Lisp_Object prop, Lisp_Object object, Lisp_Object *overlay) |
6063
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
597 { |
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
598 struct window *w = 0; |
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
599 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40647
diff
changeset
|
600 CHECK_NUMBER_COERCE_MARKER (position); |
6063
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
601 |
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
602 if (NILP (object)) |
9280
4b238c43e59f
(Ftext_properties_at, Fget_char_property, Fnext_property_change,
Karl Heuer <kwzh@gnu.org>
parents:
9109
diff
changeset
|
603 XSETBUFFER (object, current_buffer); |
6063
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
604 |
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
605 if (WINDOWP (object)) |
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
606 { |
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
607 w = XWINDOW (object); |
8907
f7de8b4cb1b8
(validate_interval_range, property_value, Fget_char_property,
Karl Heuer <kwzh@gnu.org>
parents:
8856
diff
changeset
|
608 object = w->buffer; |
6063
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
609 } |
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
610 if (BUFFERP (object)) |
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
611 { |
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
612 int noverlays; |
55652
2e649bd1c696
(get_char_property_and_overlay): Use GET_OVERLAYS_AT.
Kim F. Storm <storm@cua.dk>
parents:
53201
diff
changeset
|
613 Lisp_Object *overlay_vec; |
12641
aadec66110fd
(Fget_char_property): If OBJECT is non-current buffer,
Richard M. Stallman <rms@gnu.org>
parents:
11131
diff
changeset
|
614 struct buffer *obuf = current_buffer; |
aadec66110fd
(Fget_char_property): If OBJECT is non-current buffer,
Richard M. Stallman <rms@gnu.org>
parents:
11131
diff
changeset
|
615 |
87488
f53d1d3c813f
(get_char_property_and_overlay):
Richard M. Stallman <rms@gnu.org>
parents:
85973
diff
changeset
|
616 if (XINT (position) < BUF_BEGV (XBUFFER (object)) |
f53d1d3c813f
(get_char_property_and_overlay):
Richard M. Stallman <rms@gnu.org>
parents:
85973
diff
changeset
|
617 || XINT (position) > BUF_ZV (XBUFFER (object))) |
f53d1d3c813f
(get_char_property_and_overlay):
Richard M. Stallman <rms@gnu.org>
parents:
85973
diff
changeset
|
618 xsignal1 (Qargs_out_of_range, position); |
f53d1d3c813f
(get_char_property_and_overlay):
Richard M. Stallman <rms@gnu.org>
parents:
85973
diff
changeset
|
619 |
12641
aadec66110fd
(Fget_char_property): If OBJECT is non-current buffer,
Richard M. Stallman <rms@gnu.org>
parents:
11131
diff
changeset
|
620 set_buffer_temp (XBUFFER (object)); |
6063
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
621 |
55652
2e649bd1c696
(get_char_property_and_overlay): Use GET_OVERLAYS_AT.
Kim F. Storm <storm@cua.dk>
parents:
53201
diff
changeset
|
622 GET_OVERLAYS_AT (XINT (position), overlay_vec, noverlays, NULL, 0); |
6063
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
623 noverlays = sort_overlays (overlay_vec, noverlays, w); |
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
624 |
12641
aadec66110fd
(Fget_char_property): If OBJECT is non-current buffer,
Richard M. Stallman <rms@gnu.org>
parents:
11131
diff
changeset
|
625 set_buffer_temp (obuf); |
aadec66110fd
(Fget_char_property): If OBJECT is non-current buffer,
Richard M. Stallman <rms@gnu.org>
parents:
11131
diff
changeset
|
626 |
6063
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
627 /* Now check the overlays in order of decreasing priority. */ |
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
628 while (--noverlays >= 0) |
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
629 { |
55652
2e649bd1c696
(get_char_property_and_overlay): Use GET_OVERLAYS_AT.
Kim F. Storm <storm@cua.dk>
parents:
53201
diff
changeset
|
630 Lisp_Object tem = Foverlay_get (overlay_vec[noverlays], prop); |
6063
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
631 if (!NILP (tem)) |
32849
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
632 { |
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
633 if (overlay) |
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
634 /* Return the overlay we got the property from. */ |
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
635 *overlay = overlay_vec[noverlays]; |
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
636 return tem; |
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
637 } |
6063
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
638 } |
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
639 } |
32849
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
640 |
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
641 if (overlay) |
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
642 /* Indicate that the return value is not from an overlay. */ |
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
643 *overlay = Qnil; |
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
644 |
6063
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
645 /* Not a buffer, or no appropriate overlay, so fall through to the |
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
646 simpler case. */ |
32849
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
647 return Fget_text_property (position, prop, object); |
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
648 } |
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
649 |
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
650 DEFUN ("get-char-property", Fget_char_property, Sget_char_property, 2, 3, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
651 doc: /* Return the value of POSITION's property PROP, in OBJECT. |
40647
e673a8c97e47
(Fget_char_property): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
40123
diff
changeset
|
652 Both overlay properties and text properties are checked. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
653 OBJECT is optional and defaults to the current buffer. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
654 If POSITION is at the end of OBJECT, the value is nil. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
655 If OBJECT is a buffer, then overlay properties are considered as well as |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
656 text properties. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
657 If OBJECT is a window, then that window's buffer is used, but window-specific |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
658 overlays are considered only if they are associated with OBJECT. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
659 (Lisp_Object position, Lisp_Object prop, Lisp_Object object) |
32849
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
660 { |
e1dec7e5a57c
(get_char_property_and_overlay): New function.
Miles Bader <miles@gnu.org>
parents:
30699
diff
changeset
|
661 return get_char_property_and_overlay (position, prop, object, 0); |
6063
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
662 } |
53201
c90162ba57c6
(Fget_char_property_and_overlay): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
663 |
c90162ba57c6
(Fget_char_property_and_overlay): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
664 DEFUN ("get-char-property-and-overlay", Fget_char_property_and_overlay, |
c90162ba57c6
(Fget_char_property_and_overlay): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
665 Sget_char_property_and_overlay, 2, 3, 0, |
c90162ba57c6
(Fget_char_property_and_overlay): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
666 doc: /* Like `get-char-property', but with extra overlay information. |
71575
37f7b9440897
(Fget_char_property_and_overlay): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
71499
diff
changeset
|
667 The value is a cons cell. Its car is the return value of `get-char-property' |
37f7b9440897
(Fget_char_property_and_overlay): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
71499
diff
changeset
|
668 with the same arguments--that is, the value of POSITION's property |
37f7b9440897
(Fget_char_property_and_overlay): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
71499
diff
changeset
|
669 PROP in OBJECT. Its cdr is the overlay in which the property was |
53201
c90162ba57c6
(Fget_char_property_and_overlay): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
670 found, or nil, if it was found as a text property or not found at all. |
71575
37f7b9440897
(Fget_char_property_and_overlay): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
71499
diff
changeset
|
671 |
53201
c90162ba57c6
(Fget_char_property_and_overlay): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
672 OBJECT is optional and defaults to the current buffer. OBJECT may be |
c90162ba57c6
(Fget_char_property_and_overlay): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
673 a string, a buffer or a window. For strings, the cdr of the return |
c90162ba57c6
(Fget_char_property_and_overlay): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
674 value is always nil, since strings do not have overlays. If OBJECT is |
c90162ba57c6
(Fget_char_property_and_overlay): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
675 a window, then that window's buffer is used, but window-specific |
c90162ba57c6
(Fget_char_property_and_overlay): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
676 overlays are considered only if they are associated with OBJECT. If |
c90162ba57c6
(Fget_char_property_and_overlay): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
677 POSITION is at the end of OBJECT, both car and cdr are nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
678 (Lisp_Object position, Lisp_Object prop, Lisp_Object object) |
53201
c90162ba57c6
(Fget_char_property_and_overlay): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
679 { |
c90162ba57c6
(Fget_char_property_and_overlay): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
680 Lisp_Object overlay; |
c90162ba57c6
(Fget_char_property_and_overlay): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
681 Lisp_Object val |
c90162ba57c6
(Fget_char_property_and_overlay): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
682 = get_char_property_and_overlay (position, prop, object, &overlay); |
79334 | 683 return Fcons (val, overlay); |
53201
c90162ba57c6
(Fget_char_property_and_overlay): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
684 } |
c90162ba57c6
(Fget_char_property_and_overlay): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
685 |
16679
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
686 |
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
687 DEFUN ("next-char-property-change", Fnext_char_property_change, |
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
688 Snext_char_property_change, 1, 2, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
689 doc: /* Return the position of next text property or overlay change. |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
690 This scans characters forward in the current buffer from POSITION till |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
691 it finds a change in some text property, or the beginning or end of an |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
692 overlay, and returns the position of that. |
70656
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
693 If none is found up to (point-max), the function returns (point-max). |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
694 |
64576
7a1c6e86c825
(Fnext_char_property_change, Fprevious_char_property_change): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
64084
diff
changeset
|
695 If the optional second argument LIMIT is non-nil, don't search |
70656
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
696 past position LIMIT; return LIMIT if nothing is found before LIMIT. |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
697 LIMIT is a no-op if it is greater than (point-max). */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
698 (Lisp_Object position, Lisp_Object limit) |
16679
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
699 { |
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
700 Lisp_Object temp; |
6063
233fffcfb6c8
(Fget_char_property): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5646
diff
changeset
|
701 |
16679
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
702 temp = Fnext_overlay_change (position); |
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
703 if (! NILP (limit)) |
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
704 { |
60815 | 705 CHECK_NUMBER_COERCE_MARKER (limit); |
16679
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
706 if (XINT (limit) < XINT (temp)) |
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
707 temp = limit; |
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
708 } |
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
709 return Fnext_property_change (position, Qnil, temp); |
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
710 } |
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
711 |
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
712 DEFUN ("previous-char-property-change", Fprevious_char_property_change, |
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
713 Sprevious_char_property_change, 1, 2, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
714 doc: /* Return the position of previous text property or overlay change. |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
715 Scans characters backward in the current buffer from POSITION till it |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
716 finds a change in some text property, or the beginning or end of an |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
717 overlay, and returns the position of that. |
70656
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
718 If none is found since (point-min), the function returns (point-min). |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
719 |
64576
7a1c6e86c825
(Fnext_char_property_change, Fprevious_char_property_change): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
64084
diff
changeset
|
720 If the optional second argument LIMIT is non-nil, don't search |
70656
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
721 past position LIMIT; return LIMIT if nothing is found before LIMIT. |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
722 LIMIT is a no-op if it is less than (point-min). */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
723 (Lisp_Object position, Lisp_Object limit) |
16679
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
724 { |
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
725 Lisp_Object temp; |
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
726 |
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
727 temp = Fprevious_overlay_change (position); |
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
728 if (! NILP (limit)) |
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
729 { |
60815 | 730 CHECK_NUMBER_COERCE_MARKER (limit); |
16679
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
731 if (XINT (limit) > XINT (temp)) |
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
732 temp = limit; |
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
733 } |
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
734 return Fprevious_property_change (position, Qnil, temp); |
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
735 } |
25819
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
736 |
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
737 |
30242
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
738 DEFUN ("next-single-char-property-change", Fnext_single_char_property_change, |
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
739 Snext_single_char_property_change, 2, 4, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
740 doc: /* Return the position of next text property or overlay change for a specific property. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
741 Scans characters forward from POSITION till it finds |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
742 a change in the PROP property, then returns the position of the change. |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
743 If the optional third argument OBJECT is a buffer (or nil, which means |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
744 the current buffer), POSITION is a buffer position (integer or marker). |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
745 If OBJECT is a string, POSITION is a 0-based index into it. |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
746 |
70656
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
747 In a string, scan runs to the end of the string. |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
748 In a buffer, it runs to (point-max), and the value cannot exceed that. |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
749 |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
750 The property values are compared with `eq'. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
751 If the property is constant all the way to the end of OBJECT, return the |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
752 last valid position in OBJECT. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
753 If the optional fourth argument LIMIT is non-nil, don't search |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
754 past position LIMIT; return LIMIT if nothing is found before LIMIT. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
755 (Lisp_Object position, Lisp_Object prop, Lisp_Object object, Lisp_Object limit) |
25819
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
756 { |
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
757 if (STRINGP (object)) |
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
758 { |
30242
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
759 position = Fnext_single_property_change (position, prop, object, limit); |
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
760 if (NILP (position)) |
25819
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
761 { |
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
762 if (NILP (limit)) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
763 position = make_number (SCHARS (object)); |
25819
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
764 else |
60815 | 765 { |
766 CHECK_NUMBER (limit); | |
767 position = limit; | |
768 } | |
25819
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
769 } |
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
770 } |
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
771 else |
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
772 { |
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
773 Lisp_Object initial_value, value; |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45680
diff
changeset
|
774 int count = SPECPDL_INDEX (); |
25819
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
775 |
30242
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
776 if (! NILP (object)) |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40647
diff
changeset
|
777 CHECK_BUFFER (object); |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
778 |
25819
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
779 if (BUFFERP (object) && current_buffer != XBUFFER (object)) |
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
780 { |
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
781 record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); |
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
782 Fset_buffer (object); |
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
783 } |
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
784 |
60815 | 785 CHECK_NUMBER_COERCE_MARKER (position); |
786 | |
30242
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
787 initial_value = Fget_char_property (position, prop, object); |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
788 |
30242
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
789 if (NILP (limit)) |
70656
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
790 XSETFASTINT (limit, ZV); |
30242
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
791 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40647
diff
changeset
|
792 CHECK_NUMBER_COERCE_MARKER (limit); |
30242
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
793 |
70656
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
794 if (XFASTINT (position) >= XFASTINT (limit)) |
25819
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
795 { |
70656
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
796 position = limit; |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
797 if (XFASTINT (position) > ZV) |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
798 XSETFASTINT (position, ZV); |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
799 } |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
800 else |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
801 while (1) |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
802 { |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
803 position = Fnext_char_property_change (position, limit); |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
804 if (XFASTINT (position) >= XFASTINT (limit)) |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
805 { |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
806 position = limit; |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
807 break; |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
808 } |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
809 |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
810 value = Fget_char_property (position, prop, object); |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
811 if (!EQ (value, initial_value)) |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
812 break; |
30242
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
813 } |
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
814 |
25819
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
815 unbind_to (count, Qnil); |
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
816 } |
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
817 |
30242
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
818 return position; |
25819
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
819 } |
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
820 |
30242
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
821 DEFUN ("previous-single-char-property-change", |
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
822 Fprevious_single_char_property_change, |
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
823 Sprevious_single_char_property_change, 2, 4, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
824 doc: /* Return the position of previous text property or overlay change for a specific property. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
825 Scans characters backward from POSITION till it finds |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
826 a change in the PROP property, then returns the position of the change. |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
827 If the optional third argument OBJECT is a buffer (or nil, which means |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
828 the current buffer), POSITION is a buffer position (integer or marker). |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
829 If OBJECT is a string, POSITION is a 0-based index into it. |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
830 |
70656
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
831 In a string, scan runs to the start of the string. |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
832 In a buffer, it runs to (point-min), and the value cannot be less than that. |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
833 |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
834 The property values are compared with `eq'. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
835 If the property is constant all the way to the start of OBJECT, return the |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
836 first valid position in OBJECT. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
837 If the optional fourth argument LIMIT is non-nil, don't search |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
838 back past position LIMIT; return LIMIT if nothing is found before LIMIT. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
839 (Lisp_Object position, Lisp_Object prop, Lisp_Object object, Lisp_Object limit) |
30242
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
840 { |
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
841 if (STRINGP (object)) |
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
842 { |
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
843 position = Fprevious_single_property_change (position, prop, object, limit); |
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
844 if (NILP (position)) |
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
845 { |
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
846 if (NILP (limit)) |
99343
00ce595f8afc
(Fprevious_single_char_property_change): Return 0
Martin Rudalics <rudalics@gmx.at>
parents:
95453
diff
changeset
|
847 position = make_number (0); |
30242
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
848 else |
60815 | 849 { |
850 CHECK_NUMBER (limit); | |
851 position = limit; | |
852 } | |
30242
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
853 } |
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
854 } |
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
855 else |
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
856 { |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
45680
diff
changeset
|
857 int count = SPECPDL_INDEX (); |
25819
c2163b0bac24
(next_single_char_property_change): New.
Gerd Moellmann <gerd@gnu.org>
parents:
25772
diff
changeset
|
858 |
30242
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
859 if (! NILP (object)) |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40647
diff
changeset
|
860 CHECK_BUFFER (object); |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
861 |
30242
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
862 if (BUFFERP (object) && current_buffer != XBUFFER (object)) |
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
863 { |
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
864 record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); |
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
865 Fset_buffer (object); |
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
866 } |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
867 |
60815 | 868 CHECK_NUMBER_COERCE_MARKER (position); |
869 | |
30242
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
870 if (NILP (limit)) |
70656
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
871 XSETFASTINT (limit, BEGV); |
30242
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
872 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40647
diff
changeset
|
873 CHECK_NUMBER_COERCE_MARKER (limit); |
30242
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
874 |
30379
836d2e058c70
(Fprevious_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
30242
diff
changeset
|
875 if (XFASTINT (position) <= XFASTINT (limit)) |
70656
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
876 { |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
877 position = limit; |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
878 if (XFASTINT (position) < BEGV) |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
879 XSETFASTINT (position, BEGV); |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
880 } |
30379
836d2e058c70
(Fprevious_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
30242
diff
changeset
|
881 else |
30242
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
882 { |
70656
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
883 Lisp_Object initial_value |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
884 = Fget_char_property (make_number (XFASTINT (position) - 1), |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
885 prop, object); |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
886 |
70656
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
887 while (1) |
30379
836d2e058c70
(Fprevious_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
30242
diff
changeset
|
888 { |
836d2e058c70
(Fprevious_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
30242
diff
changeset
|
889 position = Fprevious_char_property_change (position, limit); |
30242
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
890 |
30379
836d2e058c70
(Fprevious_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
30242
diff
changeset
|
891 if (XFASTINT (position) <= XFASTINT (limit)) |
836d2e058c70
(Fprevious_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
30242
diff
changeset
|
892 { |
836d2e058c70
(Fprevious_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
30242
diff
changeset
|
893 position = limit; |
836d2e058c70
(Fprevious_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
30242
diff
changeset
|
894 break; |
836d2e058c70
(Fprevious_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
30242
diff
changeset
|
895 } |
836d2e058c70
(Fprevious_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
30242
diff
changeset
|
896 else |
836d2e058c70
(Fprevious_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
30242
diff
changeset
|
897 { |
70656
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
898 Lisp_Object value |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
899 = Fget_char_property (make_number (XFASTINT (position) - 1), |
182680a57573
(Fnext_single_char_property_change)
Richard M. Stallman <rms@gnu.org>
parents:
70129
diff
changeset
|
900 prop, object); |
30379
836d2e058c70
(Fprevious_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
30242
diff
changeset
|
901 |
836d2e058c70
(Fprevious_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
30242
diff
changeset
|
902 if (!EQ (value, initial_value)) |
836d2e058c70
(Fprevious_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
30242
diff
changeset
|
903 break; |
836d2e058c70
(Fprevious_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
30242
diff
changeset
|
904 } |
836d2e058c70
(Fprevious_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
30242
diff
changeset
|
905 } |
30242
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
906 } |
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
907 |
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
908 unbind_to (count, Qnil); |
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
909 } |
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
910 |
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
911 return position; |
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
912 } |
16679
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
913 |
1029 | 914 DEFUN ("next-property-change", Fnext_property_change, |
5086
6e9634463e93
(Ftext_property_not_all): Swap t and nil values in
Richard M. Stallman <rms@gnu.org>
parents:
5020
diff
changeset
|
915 Snext_property_change, 1, 3, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
916 doc: /* Return the position of next property change. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
917 Scans characters forward from POSITION in OBJECT till it finds |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
918 a change in some text property, then returns the position of the change. |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
919 If the optional second argument OBJECT is a buffer (or nil, which means |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
920 the current buffer), POSITION is a buffer position (integer or marker). |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
921 If OBJECT is a string, POSITION is a 0-based index into it. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
922 Return nil if the property is constant all the way to the end of OBJECT. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
923 If the value is non-nil, it is a position greater than POSITION, never equal. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
924 |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
925 If the optional third argument LIMIT is non-nil, don't search |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
926 past position LIMIT; return LIMIT if nothing is found before LIMIT. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
927 (Lisp_Object position, Lisp_Object object, Lisp_Object limit) |
1029 | 928 { |
929 register INTERVAL i, next; | |
930 | |
1857
9d65dfc7bdb7
(Fadd_text_properties): Put OBJECT arg last. Make it optional.
Richard M. Stallman <rms@gnu.org>
parents:
1715
diff
changeset
|
931 if (NILP (object)) |
9280
4b238c43e59f
(Ftext_properties_at, Fget_char_property, Fnext_property_change,
Karl Heuer <kwzh@gnu.org>
parents:
9109
diff
changeset
|
932 XSETBUFFER (object, current_buffer); |
1857
9d65dfc7bdb7
(Fadd_text_properties): Put OBJECT arg last. Make it optional.
Richard M. Stallman <rms@gnu.org>
parents:
1715
diff
changeset
|
933 |
42967
51ac72369873
(Fnext_property_change, Fnext_single_property_change)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41589
diff
changeset
|
934 if (!NILP (limit) && !EQ (limit, Qt)) |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40647
diff
changeset
|
935 CHECK_NUMBER_COERCE_MARKER (limit); |
7092
b6b93953cc83
(F*_property_change): Typecheck limit argument.
Karl Heuer <kwzh@gnu.org>
parents:
6755
diff
changeset
|
936 |
14088
dc754f92a2a4
(Ftext_properties_at, Fget_text_property, Fget_char_property,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
937 i = validate_interval_range (object, &position, &position, soft); |
1029 | 938 |
10962
7f0bc7bcf1f3
(Fnext_property_change): Handle LIMIT = t.
Richard M. Stallman <rms@gnu.org>
parents:
10925
diff
changeset
|
939 /* If LIMIT is t, return start of next interval--don't |
7f0bc7bcf1f3
(Fnext_property_change): Handle LIMIT = t.
Richard M. Stallman <rms@gnu.org>
parents:
10925
diff
changeset
|
940 bother checking further intervals. */ |
7f0bc7bcf1f3
(Fnext_property_change): Handle LIMIT = t.
Richard M. Stallman <rms@gnu.org>
parents:
10925
diff
changeset
|
941 if (EQ (limit, Qt)) |
7f0bc7bcf1f3
(Fnext_property_change): Handle LIMIT = t.
Richard M. Stallman <rms@gnu.org>
parents:
10925
diff
changeset
|
942 { |
13265
dbc038e66ea6
(Fnext_single_property_change): Rearrange handling of
Richard M. Stallman <rms@gnu.org>
parents:
13027
diff
changeset
|
943 if (NULL_INTERVAL_P (i)) |
dbc038e66ea6
(Fnext_single_property_change): Rearrange handling of
Richard M. Stallman <rms@gnu.org>
parents:
13027
diff
changeset
|
944 next = i; |
dbc038e66ea6
(Fnext_single_property_change): Rearrange handling of
Richard M. Stallman <rms@gnu.org>
parents:
13027
diff
changeset
|
945 else |
dbc038e66ea6
(Fnext_single_property_change): Rearrange handling of
Richard M. Stallman <rms@gnu.org>
parents:
13027
diff
changeset
|
946 next = next_interval (i); |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
947 |
11116
73b51ad289e3
(Fnext_property_change): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
10962
diff
changeset
|
948 if (NULL_INTERVAL_P (next)) |
14088
dc754f92a2a4
(Ftext_properties_at, Fget_text_property, Fget_char_property,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
949 XSETFASTINT (position, (STRINGP (object) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
950 ? SCHARS (object) |
14088
dc754f92a2a4
(Ftext_properties_at, Fget_text_property, Fget_char_property,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
951 : BUF_ZV (XBUFFER (object)))); |
11116
73b51ad289e3
(Fnext_property_change): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents:
10962
diff
changeset
|
952 else |
22344
2ec50b4767ed
Handle the new convention that `position' values
Karl Heuer <kwzh@gnu.org>
parents:
22280
diff
changeset
|
953 XSETFASTINT (position, next->position); |
14088
dc754f92a2a4
(Ftext_properties_at, Fget_text_property, Fget_char_property,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
954 return position; |
10962
7f0bc7bcf1f3
(Fnext_property_change): Handle LIMIT = t.
Richard M. Stallman <rms@gnu.org>
parents:
10925
diff
changeset
|
955 } |
7f0bc7bcf1f3
(Fnext_property_change): Handle LIMIT = t.
Richard M. Stallman <rms@gnu.org>
parents:
10925
diff
changeset
|
956 |
13265
dbc038e66ea6
(Fnext_single_property_change): Rearrange handling of
Richard M. Stallman <rms@gnu.org>
parents:
13027
diff
changeset
|
957 if (NULL_INTERVAL_P (i)) |
dbc038e66ea6
(Fnext_single_property_change): Rearrange handling of
Richard M. Stallman <rms@gnu.org>
parents:
13027
diff
changeset
|
958 return limit; |
dbc038e66ea6
(Fnext_single_property_change): Rearrange handling of
Richard M. Stallman <rms@gnu.org>
parents:
13027
diff
changeset
|
959 |
dbc038e66ea6
(Fnext_single_property_change): Rearrange handling of
Richard M. Stallman <rms@gnu.org>
parents:
13027
diff
changeset
|
960 next = next_interval (i); |
dbc038e66ea6
(Fnext_single_property_change): Rearrange handling of
Richard M. Stallman <rms@gnu.org>
parents:
13027
diff
changeset
|
961 |
42967
51ac72369873
(Fnext_property_change, Fnext_single_property_change)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41589
diff
changeset
|
962 while (!NULL_INTERVAL_P (next) && intervals_equal (i, next) |
22344
2ec50b4767ed
Handle the new convention that `position' values
Karl Heuer <kwzh@gnu.org>
parents:
22280
diff
changeset
|
963 && (NILP (limit) || next->position < XFASTINT (limit))) |
1029 | 964 next = next_interval (next); |
965 | |
72834
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
966 if (NULL_INTERVAL_P (next) |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
967 || (next->position |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
968 >= (INTEGERP (limit) |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
969 ? XFASTINT (limit) |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
970 : (STRINGP (object) |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
971 ? SCHARS (object) |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
972 : BUF_ZV (XBUFFER (object)))))) |
5086
6e9634463e93
(Ftext_property_not_all): Swap t and nil values in
Richard M. Stallman <rms@gnu.org>
parents:
5020
diff
changeset
|
973 return limit; |
72834
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
974 else |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
975 return make_number (next->position); |
4381
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
976 } |
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
977 |
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
978 /* Return 1 if there's a change in some property between BEG and END. */ |
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
979 |
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
980 int |
110564
08d10ad776d8
Fix int/EMACS_INT use in textprop.c and window.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109179
diff
changeset
|
981 property_change_between_p (EMACS_INT beg, EMACS_INT end) |
4381
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
982 { |
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
983 register INTERVAL i, next; |
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
984 Lisp_Object object, pos; |
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
985 |
9280
4b238c43e59f
(Ftext_properties_at, Fget_char_property, Fnext_property_change,
Karl Heuer <kwzh@gnu.org>
parents:
9109
diff
changeset
|
986 XSETBUFFER (object, current_buffer); |
9321
e6759002383c
(Fnext_property_change, property_change_between_p,
Karl Heuer <kwzh@gnu.org>
parents:
9280
diff
changeset
|
987 XSETFASTINT (pos, beg); |
4381
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
988 |
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
989 i = validate_interval_range (object, &pos, &pos, soft); |
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
990 if (NULL_INTERVAL_P (i)) |
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
991 return 0; |
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
992 |
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
993 next = next_interval (i); |
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
994 while (! NULL_INTERVAL_P (next) && intervals_equal (i, next)) |
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
995 { |
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
996 next = next_interval (next); |
4614
2c5557903994
(property_change_between_p): Test NULL_INTERVAL_P
Richard M. Stallman <rms@gnu.org>
parents:
4381
diff
changeset
|
997 if (NULL_INTERVAL_P (next)) |
2c5557903994
(property_change_between_p): Test NULL_INTERVAL_P
Richard M. Stallman <rms@gnu.org>
parents:
4381
diff
changeset
|
998 return 0; |
22344
2ec50b4767ed
Handle the new convention that `position' values
Karl Heuer <kwzh@gnu.org>
parents:
22280
diff
changeset
|
999 if (next->position >= end) |
4381
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
1000 return 0; |
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
1001 } |
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
1002 |
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
1003 if (NULL_INTERVAL_P (next)) |
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
1004 return 0; |
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
1005 |
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
1006 return 1; |
1029 | 1007 } |
1008 | |
1211 | 1009 DEFUN ("next-single-property-change", Fnext_single_property_change, |
5086
6e9634463e93
(Ftext_property_not_all): Swap t and nil values in
Richard M. Stallman <rms@gnu.org>
parents:
5020
diff
changeset
|
1010 Snext_single_property_change, 2, 4, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1011 doc: /* Return the position of next property change for a specific property. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1012 Scans characters forward from POSITION till it finds |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1013 a change in the PROP property, then returns the position of the change. |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1014 If the optional third argument OBJECT is a buffer (or nil, which means |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1015 the current buffer), POSITION is a buffer position (integer or marker). |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1016 If OBJECT is a string, POSITION is a 0-based index into it. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1017 The property values are compared with `eq'. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1018 Return nil if the property is constant all the way to the end of OBJECT. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1019 If the value is non-nil, it is a position greater than POSITION, never equal. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1020 |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1021 If the optional fourth argument LIMIT is non-nil, don't search |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1022 past position LIMIT; return LIMIT if nothing is found before LIMIT. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1023 (Lisp_Object position, Lisp_Object prop, Lisp_Object object, Lisp_Object limit) |
1211 | 1024 { |
1025 register INTERVAL i, next; | |
1026 register Lisp_Object here_val; | |
1027 | |
1857
9d65dfc7bdb7
(Fadd_text_properties): Put OBJECT arg last. Make it optional.
Richard M. Stallman <rms@gnu.org>
parents:
1715
diff
changeset
|
1028 if (NILP (object)) |
9280
4b238c43e59f
(Ftext_properties_at, Fget_char_property, Fnext_property_change,
Karl Heuer <kwzh@gnu.org>
parents:
9109
diff
changeset
|
1029 XSETBUFFER (object, current_buffer); |
1857
9d65dfc7bdb7
(Fadd_text_properties): Put OBJECT arg last. Make it optional.
Richard M. Stallman <rms@gnu.org>
parents:
1715
diff
changeset
|
1030 |
7092
b6b93953cc83
(F*_property_change): Typecheck limit argument.
Karl Heuer <kwzh@gnu.org>
parents:
6755
diff
changeset
|
1031 if (!NILP (limit)) |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40647
diff
changeset
|
1032 CHECK_NUMBER_COERCE_MARKER (limit); |
7092
b6b93953cc83
(F*_property_change): Typecheck limit argument.
Karl Heuer <kwzh@gnu.org>
parents:
6755
diff
changeset
|
1033 |
14088
dc754f92a2a4
(Ftext_properties_at, Fget_text_property, Fget_char_property,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1034 i = validate_interval_range (object, &position, &position, soft); |
1211 | 1035 if (NULL_INTERVAL_P (i)) |
5086
6e9634463e93
(Ftext_property_not_all): Swap t and nil values in
Richard M. Stallman <rms@gnu.org>
parents:
5020
diff
changeset
|
1036 return limit; |
1211 | 1037 |
2762
dd28ed1e1928
* textprop.c (Fnext_single_property_change,
Jim Blandy <jimb@redhat.com>
parents:
2124
diff
changeset
|
1038 here_val = textget (i->plist, prop); |
1211 | 1039 next = next_interval (i); |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1040 while (! NULL_INTERVAL_P (next) |
5086
6e9634463e93
(Ftext_property_not_all): Swap t and nil values in
Richard M. Stallman <rms@gnu.org>
parents:
5020
diff
changeset
|
1041 && EQ (here_val, textget (next->plist, prop)) |
22344
2ec50b4767ed
Handle the new convention that `position' values
Karl Heuer <kwzh@gnu.org>
parents:
22280
diff
changeset
|
1042 && (NILP (limit) || next->position < XFASTINT (limit))) |
1211 | 1043 next = next_interval (next); |
1044 | |
72834
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
1045 if (NULL_INTERVAL_P (next) |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
1046 || (next->position |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
1047 >= (INTEGERP (limit) |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
1048 ? XFASTINT (limit) |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
1049 : (STRINGP (object) |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
1050 ? SCHARS (object) |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
1051 : BUF_ZV (XBUFFER (object)))))) |
5086
6e9634463e93
(Ftext_property_not_all): Swap t and nil values in
Richard M. Stallman <rms@gnu.org>
parents:
5020
diff
changeset
|
1052 return limit; |
72834
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
1053 else |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
1054 return make_number (next->position); |
1211 | 1055 } |
1056 | |
1029 | 1057 DEFUN ("previous-property-change", Fprevious_property_change, |
5086
6e9634463e93
(Ftext_property_not_all): Swap t and nil values in
Richard M. Stallman <rms@gnu.org>
parents:
5020
diff
changeset
|
1058 Sprevious_property_change, 1, 3, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1059 doc: /* Return the position of previous property change. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1060 Scans characters backwards from POSITION in OBJECT till it finds |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1061 a change in some text property, then returns the position of the change. |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1062 If the optional second argument OBJECT is a buffer (or nil, which means |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1063 the current buffer), POSITION is a buffer position (integer or marker). |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1064 If OBJECT is a string, POSITION is a 0-based index into it. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1065 Return nil if the property is constant all the way to the start of OBJECT. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1066 If the value is non-nil, it is a position less than POSITION, never equal. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1067 |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1068 If the optional third argument LIMIT is non-nil, don't search |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1069 back past position LIMIT; return LIMIT if nothing is found until LIMIT. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1070 (Lisp_Object position, Lisp_Object object, Lisp_Object limit) |
1029 | 1071 { |
1072 register INTERVAL i, previous; | |
1073 | |
1857
9d65dfc7bdb7
(Fadd_text_properties): Put OBJECT arg last. Make it optional.
Richard M. Stallman <rms@gnu.org>
parents:
1715
diff
changeset
|
1074 if (NILP (object)) |
9280
4b238c43e59f
(Ftext_properties_at, Fget_char_property, Fnext_property_change,
Karl Heuer <kwzh@gnu.org>
parents:
9109
diff
changeset
|
1075 XSETBUFFER (object, current_buffer); |
1857
9d65dfc7bdb7
(Fadd_text_properties): Put OBJECT arg last. Make it optional.
Richard M. Stallman <rms@gnu.org>
parents:
1715
diff
changeset
|
1076 |
7092
b6b93953cc83
(F*_property_change): Typecheck limit argument.
Karl Heuer <kwzh@gnu.org>
parents:
6755
diff
changeset
|
1077 if (!NILP (limit)) |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40647
diff
changeset
|
1078 CHECK_NUMBER_COERCE_MARKER (limit); |
7092
b6b93953cc83
(F*_property_change): Typecheck limit argument.
Karl Heuer <kwzh@gnu.org>
parents:
6755
diff
changeset
|
1079 |
14088
dc754f92a2a4
(Ftext_properties_at, Fget_text_property, Fget_char_property,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1080 i = validate_interval_range (object, &position, &position, soft); |
1029 | 1081 if (NULL_INTERVAL_P (i)) |
5086
6e9634463e93
(Ftext_property_not_all): Swap t and nil values in
Richard M. Stallman <rms@gnu.org>
parents:
5020
diff
changeset
|
1082 return limit; |
1029 | 1083 |
5644
2abe67658895
(Fprevious_property_change): Move back at least 1 char.
Richard M. Stallman <rms@gnu.org>
parents:
5114
diff
changeset
|
1084 /* Start with the interval containing the char before point. */ |
14088
dc754f92a2a4
(Ftext_properties_at, Fget_text_property, Fget_char_property,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1085 if (i->position == XFASTINT (position)) |
5644
2abe67658895
(Fprevious_property_change): Move back at least 1 char.
Richard M. Stallman <rms@gnu.org>
parents:
5114
diff
changeset
|
1086 i = previous_interval (i); |
2abe67658895
(Fprevious_property_change): Move back at least 1 char.
Richard M. Stallman <rms@gnu.org>
parents:
5114
diff
changeset
|
1087 |
1029 | 1088 previous = previous_interval (i); |
42967
51ac72369873
(Fnext_property_change, Fnext_single_property_change)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41589
diff
changeset
|
1089 while (!NULL_INTERVAL_P (previous) && intervals_equal (previous, i) |
5086
6e9634463e93
(Ftext_property_not_all): Swap t and nil values in
Richard M. Stallman <rms@gnu.org>
parents:
5020
diff
changeset
|
1090 && (NILP (limit) |
22344
2ec50b4767ed
Handle the new convention that `position' values
Karl Heuer <kwzh@gnu.org>
parents:
22280
diff
changeset
|
1091 || (previous->position + LENGTH (previous) > XFASTINT (limit)))) |
1029 | 1092 previous = previous_interval (previous); |
72834
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
1093 |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
1094 if (NULL_INTERVAL_P (previous) |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
1095 || (previous->position + LENGTH (previous) |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
1096 <= (INTEGERP (limit) |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
1097 ? XFASTINT (limit) |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
1098 : (STRINGP (object) ? 0 : BUF_BEGV (XBUFFER (object)))))) |
5086
6e9634463e93
(Ftext_property_not_all): Swap t and nil values in
Richard M. Stallman <rms@gnu.org>
parents:
5020
diff
changeset
|
1099 return limit; |
72834
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
1100 else |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
1101 return make_number (previous->position + LENGTH (previous)); |
1029 | 1102 } |
1103 | |
1211 | 1104 DEFUN ("previous-single-property-change", Fprevious_single_property_change, |
5086
6e9634463e93
(Ftext_property_not_all): Swap t and nil values in
Richard M. Stallman <rms@gnu.org>
parents:
5020
diff
changeset
|
1105 Sprevious_single_property_change, 2, 4, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1106 doc: /* Return the position of previous property change for a specific property. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1107 Scans characters backward from POSITION till it finds |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1108 a change in the PROP property, then returns the position of the change. |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1109 If the optional third argument OBJECT is a buffer (or nil, which means |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1110 the current buffer), POSITION is a buffer position (integer or marker). |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1111 If OBJECT is a string, POSITION is a 0-based index into it. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1112 The property values are compared with `eq'. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1113 Return nil if the property is constant all the way to the start of OBJECT. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1114 If the value is non-nil, it is a position less than POSITION, never equal. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1115 |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1116 If the optional fourth argument LIMIT is non-nil, don't search |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1117 back past position LIMIT; return LIMIT if nothing is found until LIMIT. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1118 (Lisp_Object position, Lisp_Object prop, Lisp_Object object, Lisp_Object limit) |
1211 | 1119 { |
1120 register INTERVAL i, previous; | |
1121 register Lisp_Object here_val; | |
1122 | |
1857
9d65dfc7bdb7
(Fadd_text_properties): Put OBJECT arg last. Make it optional.
Richard M. Stallman <rms@gnu.org>
parents:
1715
diff
changeset
|
1123 if (NILP (object)) |
9280
4b238c43e59f
(Ftext_properties_at, Fget_char_property, Fnext_property_change,
Karl Heuer <kwzh@gnu.org>
parents:
9109
diff
changeset
|
1124 XSETBUFFER (object, current_buffer); |
1857
9d65dfc7bdb7
(Fadd_text_properties): Put OBJECT arg last. Make it optional.
Richard M. Stallman <rms@gnu.org>
parents:
1715
diff
changeset
|
1125 |
7092
b6b93953cc83
(F*_property_change): Typecheck limit argument.
Karl Heuer <kwzh@gnu.org>
parents:
6755
diff
changeset
|
1126 if (!NILP (limit)) |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40647
diff
changeset
|
1127 CHECK_NUMBER_COERCE_MARKER (limit); |
7092
b6b93953cc83
(F*_property_change): Typecheck limit argument.
Karl Heuer <kwzh@gnu.org>
parents:
6755
diff
changeset
|
1128 |
14088
dc754f92a2a4
(Ftext_properties_at, Fget_text_property, Fget_char_property,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1129 i = validate_interval_range (object, &position, &position, soft); |
7773
2226c7efb3da
(Fprevious_single_property_change): Check for null interval after correcting
Karl Heuer <kwzh@gnu.org>
parents:
7582
diff
changeset
|
1130 |
2226c7efb3da
(Fprevious_single_property_change): Check for null interval after correcting
Karl Heuer <kwzh@gnu.org>
parents:
7582
diff
changeset
|
1131 /* Start with the interval containing the char before point. */ |
42967
51ac72369873
(Fnext_property_change, Fnext_single_property_change)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41589
diff
changeset
|
1132 if (!NULL_INTERVAL_P (i) && i->position == XFASTINT (position)) |
7773
2226c7efb3da
(Fprevious_single_property_change): Check for null interval after correcting
Karl Heuer <kwzh@gnu.org>
parents:
7582
diff
changeset
|
1133 i = previous_interval (i); |
2226c7efb3da
(Fprevious_single_property_change): Check for null interval after correcting
Karl Heuer <kwzh@gnu.org>
parents:
7582
diff
changeset
|
1134 |
1211 | 1135 if (NULL_INTERVAL_P (i)) |
5086
6e9634463e93
(Ftext_property_not_all): Swap t and nil values in
Richard M. Stallman <rms@gnu.org>
parents:
5020
diff
changeset
|
1136 return limit; |
1211 | 1137 |
2762
dd28ed1e1928
* textprop.c (Fnext_single_property_change,
Jim Blandy <jimb@redhat.com>
parents:
2124
diff
changeset
|
1138 here_val = textget (i->plist, prop); |
1211 | 1139 previous = previous_interval (i); |
42967
51ac72369873
(Fnext_property_change, Fnext_single_property_change)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41589
diff
changeset
|
1140 while (!NULL_INTERVAL_P (previous) |
5086
6e9634463e93
(Ftext_property_not_all): Swap t and nil values in
Richard M. Stallman <rms@gnu.org>
parents:
5020
diff
changeset
|
1141 && EQ (here_val, textget (previous->plist, prop)) |
6e9634463e93
(Ftext_property_not_all): Swap t and nil values in
Richard M. Stallman <rms@gnu.org>
parents:
5020
diff
changeset
|
1142 && (NILP (limit) |
22344
2ec50b4767ed
Handle the new convention that `position' values
Karl Heuer <kwzh@gnu.org>
parents:
22280
diff
changeset
|
1143 || (previous->position + LENGTH (previous) > XFASTINT (limit)))) |
1211 | 1144 previous = previous_interval (previous); |
72834
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
1145 |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
1146 if (NULL_INTERVAL_P (previous) |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
1147 || (previous->position + LENGTH (previous) |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
1148 <= (INTEGERP (limit) |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
1149 ? XFASTINT (limit) |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
1150 : (STRINGP (object) ? 0 : BUF_BEGV (XBUFFER (object)))))) |
5086
6e9634463e93
(Ftext_property_not_all): Swap t and nil values in
Richard M. Stallman <rms@gnu.org>
parents:
5020
diff
changeset
|
1151 return limit; |
72834
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
1152 else |
84ff2640fb2a
* textprop.c (Fnext_property_change, Fnext_single_property_change)
Chong Yidong <cyd@stupidchicken.com>
parents:
72592
diff
changeset
|
1153 return make_number (previous->position + LENGTH (previous)); |
1211 | 1154 } |
16679
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
1155 |
10159
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1156 /* Callers note, this can GC when OBJECT is a buffer (or nil). */ |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1157 |
1029 | 1158 DEFUN ("add-text-properties", Fadd_text_properties, |
1857
9d65dfc7bdb7
(Fadd_text_properties): Put OBJECT arg last. Make it optional.
Richard M. Stallman <rms@gnu.org>
parents:
1715
diff
changeset
|
1159 Sadd_text_properties, 3, 4, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1160 doc: /* Add properties to the text from START to END. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1161 The third argument PROPERTIES is a property list |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1162 specifying the property values to add. If the optional fourth argument |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1163 OBJECT is a buffer (or nil, which means the current buffer), |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1164 START and END are buffer positions (integers or markers). |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1165 If OBJECT is a string, START and END are 0-based indices into it. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1166 Return t if any property value actually changed, nil otherwise. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1167 (Lisp_Object start, Lisp_Object end, Lisp_Object properties, Lisp_Object object) |
1029 | 1168 { |
1169 register INTERVAL i, unchanged; | |
110564
08d10ad776d8
Fix int/EMACS_INT use in textprop.c and window.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109179
diff
changeset
|
1170 register EMACS_INT s, len; |
08d10ad776d8
Fix int/EMACS_INT use in textprop.c and window.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109179
diff
changeset
|
1171 register int modified = 0; |
10159
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1172 struct gcpro gcpro1; |
1029 | 1173 |
1174 properties = validate_plist (properties); | |
1175 if (NILP (properties)) | |
1176 return Qnil; | |
1177 | |
1857
9d65dfc7bdb7
(Fadd_text_properties): Put OBJECT arg last. Make it optional.
Richard M. Stallman <rms@gnu.org>
parents:
1715
diff
changeset
|
1178 if (NILP (object)) |
9280
4b238c43e59f
(Ftext_properties_at, Fget_char_property, Fnext_property_change,
Karl Heuer <kwzh@gnu.org>
parents:
9109
diff
changeset
|
1179 XSETBUFFER (object, current_buffer); |
1857
9d65dfc7bdb7
(Fadd_text_properties): Put OBJECT arg last. Make it optional.
Richard M. Stallman <rms@gnu.org>
parents:
1715
diff
changeset
|
1180 |
1029 | 1181 i = validate_interval_range (object, &start, &end, hard); |
1182 if (NULL_INTERVAL_P (i)) | |
1183 return Qnil; | |
1184 | |
1185 s = XINT (start); | |
1186 len = XINT (end) - s; | |
1187 | |
10159
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1188 /* No need to protect OBJECT, because we GC only if it's a buffer, |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1189 and live buffers are always protected. */ |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1190 GCPRO1 (properties); |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1191 |
1029 | 1192 /* If we're not starting on an interval boundary, we have to |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
1193 split this interval. */ |
1029 | 1194 if (i->position != s) |
1195 { | |
1196 /* If this interval already has the properties, we can | |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
1197 skip it. */ |
1029 | 1198 if (interval_has_all_properties (properties, i)) |
1199 { | |
110564
08d10ad776d8
Fix int/EMACS_INT use in textprop.c and window.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109179
diff
changeset
|
1200 EMACS_INT got = (LENGTH (i) - (s - i->position)); |
1029 | 1201 if (got >= len) |
14538
a17752d2b0c0
(Fadd_text_properties): Don't return without ungcpro.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
1202 RETURN_UNGCPRO (Qnil); |
1029 | 1203 len -= got; |
3858
e07d474bdba9
(Fremove_text_properties, Fadd_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
3698
diff
changeset
|
1204 i = next_interval (i); |
1029 | 1205 } |
1206 else | |
1207 { | |
1208 unchanged = i; | |
4144
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1209 i = split_interval_right (unchanged, s - unchanged->position); |
1029 | 1210 copy_properties (unchanged, i); |
1211 } | |
1212 } | |
1213 | |
16339
abcd50093b4e
(Fset_text_properties, Fadd_text_properties)
Richard M. Stallman <rms@gnu.org>
parents:
16331
diff
changeset
|
1214 if (BUFFERP (object)) |
72592
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
1215 modify_region (XBUFFER (object), XINT (start), XINT (end), 1); |
16331
32a51f7ba384
(set_properties, add_properties, remove_properties):
Richard M. Stallman <rms@gnu.org>
parents:
16103
diff
changeset
|
1216 |
3553
5f9688c0b704
(Fadd_text_properties): Don't treat the initial
Richard M. Stallman <rms@gnu.org>
parents:
2783
diff
changeset
|
1217 /* We are at the beginning of interval I, with LEN chars to scan. */ |
2124
54179ef9ce35
* textprop.c (Fadd_text_properties): Initialize the modified flag.
Jim Blandy <jimb@redhat.com>
parents:
2058
diff
changeset
|
1218 for (;;) |
1029 | 1219 { |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
1220 if (i == 0) |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
1221 abort (); |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
1222 |
1029 | 1223 if (LENGTH (i) >= len) |
1224 { | |
10159
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1225 /* We can UNGCPRO safely here, because there will be just |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1226 one more chance to gc, in the next call to add_properties, |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1227 and after that we will not need PROPERTIES or OBJECT again. */ |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1228 UNGCPRO; |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1229 |
1029 | 1230 if (interval_has_all_properties (properties, i)) |
16331
32a51f7ba384
(set_properties, add_properties, remove_properties):
Richard M. Stallman <rms@gnu.org>
parents:
16103
diff
changeset
|
1231 { |
16339
abcd50093b4e
(Fset_text_properties, Fadd_text_properties)
Richard M. Stallman <rms@gnu.org>
parents:
16331
diff
changeset
|
1232 if (BUFFERP (object)) |
abcd50093b4e
(Fset_text_properties, Fadd_text_properties)
Richard M. Stallman <rms@gnu.org>
parents:
16331
diff
changeset
|
1233 signal_after_change (XINT (start), XINT (end) - XINT (start), |
abcd50093b4e
(Fset_text_properties, Fadd_text_properties)
Richard M. Stallman <rms@gnu.org>
parents:
16331
diff
changeset
|
1234 XINT (end) - XINT (start)); |
16331
32a51f7ba384
(set_properties, add_properties, remove_properties):
Richard M. Stallman <rms@gnu.org>
parents:
16103
diff
changeset
|
1235 |
32a51f7ba384
(set_properties, add_properties, remove_properties):
Richard M. Stallman <rms@gnu.org>
parents:
16103
diff
changeset
|
1236 return modified ? Qt : Qnil; |
32a51f7ba384
(set_properties, add_properties, remove_properties):
Richard M. Stallman <rms@gnu.org>
parents:
16103
diff
changeset
|
1237 } |
1029 | 1238 |
1239 if (LENGTH (i) == len) | |
1240 { | |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
1241 add_properties (properties, i, object); |
16339
abcd50093b4e
(Fset_text_properties, Fadd_text_properties)
Richard M. Stallman <rms@gnu.org>
parents:
16331
diff
changeset
|
1242 if (BUFFERP (object)) |
abcd50093b4e
(Fset_text_properties, Fadd_text_properties)
Richard M. Stallman <rms@gnu.org>
parents:
16331
diff
changeset
|
1243 signal_after_change (XINT (start), XINT (end) - XINT (start), |
abcd50093b4e
(Fset_text_properties, Fadd_text_properties)
Richard M. Stallman <rms@gnu.org>
parents:
16331
diff
changeset
|
1244 XINT (end) - XINT (start)); |
1029 | 1245 return Qt; |
1246 } | |
1247 | |
1248 /* i doesn't have the properties, and goes past the change limit */ | |
1249 unchanged = i; | |
4144
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1250 i = split_interval_left (unchanged, len); |
1029 | 1251 copy_properties (unchanged, i); |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
1252 add_properties (properties, i, object); |
16339
abcd50093b4e
(Fset_text_properties, Fadd_text_properties)
Richard M. Stallman <rms@gnu.org>
parents:
16331
diff
changeset
|
1253 if (BUFFERP (object)) |
abcd50093b4e
(Fset_text_properties, Fadd_text_properties)
Richard M. Stallman <rms@gnu.org>
parents:
16331
diff
changeset
|
1254 signal_after_change (XINT (start), XINT (end) - XINT (start), |
abcd50093b4e
(Fset_text_properties, Fadd_text_properties)
Richard M. Stallman <rms@gnu.org>
parents:
16331
diff
changeset
|
1255 XINT (end) - XINT (start)); |
1029 | 1256 return Qt; |
1257 } | |
1258 | |
1259 len -= LENGTH (i); | |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
1260 modified += add_properties (properties, i, object); |
1029 | 1261 i = next_interval (i); |
1262 } | |
1263 } | |
1264 | |
10159
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1265 /* Callers note, this can GC when OBJECT is a buffer (or nil). */ |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1266 |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
1267 DEFUN ("put-text-property", Fput_text_property, |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
1268 Sput_text_property, 4, 5, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1269 doc: /* Set one property of the text from START to END. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1270 The third and fourth arguments PROPERTY and VALUE |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1271 specify the property to add. |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1272 If the optional fifth argument OBJECT is a buffer (or nil, which means |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1273 the current buffer), START and END are buffer positions (integers or |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1274 markers). If OBJECT is a string, START and END are 0-based indices into it. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1275 (Lisp_Object start, Lisp_Object end, Lisp_Object property, Lisp_Object value, Lisp_Object object) |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
1276 { |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
1277 Fadd_text_properties (start, end, |
14088
dc754f92a2a4
(Ftext_properties_at, Fget_text_property, Fget_char_property,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1278 Fcons (property, Fcons (value, Qnil)), |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
1279 object); |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
1280 return Qnil; |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
1281 } |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
1282 |
1029 | 1283 DEFUN ("set-text-properties", Fset_text_properties, |
1857
9d65dfc7bdb7
(Fadd_text_properties): Put OBJECT arg last. Make it optional.
Richard M. Stallman <rms@gnu.org>
parents:
1715
diff
changeset
|
1284 Sset_text_properties, 3, 4, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1285 doc: /* Completely replace properties of text from START to END. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1286 The third argument PROPERTIES is the new property list. |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1287 If the optional fourth argument OBJECT is a buffer (or nil, which means |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1288 the current buffer), START and END are buffer positions (integers or |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1289 markers). If OBJECT is a string, START and END are 0-based indices into it. |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1290 If PROPERTIES is nil, the effect is to remove all properties from |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1291 the designated part of OBJECT. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1292 (Lisp_Object start, Lisp_Object end, Lisp_Object properties, Lisp_Object object) |
1029 | 1293 { |
26605
46168cb41ba0
(set_text_properties): New function. Like
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
1294 return set_text_properties (start, end, properties, object, Qt); |
46168cb41ba0
(set_text_properties): New function. Like
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
1295 } |
46168cb41ba0
(set_text_properties): New function. Like
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
1296 |
46168cb41ba0
(set_text_properties): New function. Like
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
1297 |
46168cb41ba0
(set_text_properties): New function. Like
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
1298 /* Replace properties of text from START to END with new list of |
46168cb41ba0
(set_text_properties): New function. Like
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
1299 properties PROPERTIES. OBJECT is the buffer or string containing |
46168cb41ba0
(set_text_properties): New function. Like
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
1300 the text. OBJECT nil means use the current buffer. |
106904
943a92f3710b
Fix spurious before-change-functions invocation from (insert ?\n).
Alan Mackenzie <acm@muc.de>
parents:
105877
diff
changeset
|
1301 COHERENT_CHANGE_P nil means this is being called as an internal |
943a92f3710b
Fix spurious before-change-functions invocation from (insert ?\n).
Alan Mackenzie <acm@muc.de>
parents:
105877
diff
changeset
|
1302 subroutine, rather than as a change primitive with checking of |
943a92f3710b
Fix spurious before-change-functions invocation from (insert ?\n).
Alan Mackenzie <acm@muc.de>
parents:
105877
diff
changeset
|
1303 read-only, invoking change hooks, etc.. Value is nil if the |
943a92f3710b
Fix spurious before-change-functions invocation from (insert ?\n).
Alan Mackenzie <acm@muc.de>
parents:
105877
diff
changeset
|
1304 function _detected_ that it did not replace any properties, non-nil |
943a92f3710b
Fix spurious before-change-functions invocation from (insert ?\n).
Alan Mackenzie <acm@muc.de>
parents:
105877
diff
changeset
|
1305 otherwise. */ |
26605
46168cb41ba0
(set_text_properties): New function. Like
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
1306 |
46168cb41ba0
(set_text_properties): New function. Like
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
1307 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1308 set_text_properties (Lisp_Object start, Lisp_Object end, Lisp_Object properties, Lisp_Object object, Lisp_Object coherent_change_p) |
26605
46168cb41ba0
(set_text_properties): New function. Like
Gerd Moellmann <gerd@gnu.org>
parents:
26404
diff
changeset
|
1309 { |
41391
44d3d642d0c4
(Fset_text_properties): Remove unused variables `unchanged',
Pavel Janík <Pavel@Janik.cz>
parents:
40921
diff
changeset
|
1310 register INTERVAL i; |
9071
2d4d0f6e7be0
(syms_of_textprop): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8962
diff
changeset
|
1311 Lisp_Object ostart, oend; |
2d4d0f6e7be0
(syms_of_textprop): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8962
diff
changeset
|
1312 |
2d4d0f6e7be0
(syms_of_textprop): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8962
diff
changeset
|
1313 ostart = start; |
2d4d0f6e7be0
(syms_of_textprop): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8962
diff
changeset
|
1314 oend = end; |
1029 | 1315 |
14088
dc754f92a2a4
(Ftext_properties_at, Fget_text_property, Fget_char_property,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1316 properties = validate_plist (properties); |
1029 | 1317 |
1857
9d65dfc7bdb7
(Fadd_text_properties): Put OBJECT arg last. Make it optional.
Richard M. Stallman <rms@gnu.org>
parents:
1715
diff
changeset
|
1318 if (NILP (object)) |
9280
4b238c43e59f
(Ftext_properties_at, Fget_char_property, Fnext_property_change,
Karl Heuer <kwzh@gnu.org>
parents:
9109
diff
changeset
|
1319 XSETBUFFER (object, current_buffer); |
1857
9d65dfc7bdb7
(Fadd_text_properties): Put OBJECT arg last. Make it optional.
Richard M. Stallman <rms@gnu.org>
parents:
1715
diff
changeset
|
1320 |
9541
449e024f13be
(Fset_text_properties): Special case for getting
Richard M. Stallman <rms@gnu.org>
parents:
9331
diff
changeset
|
1321 /* If we want no properties for a whole string, |
449e024f13be
(Fset_text_properties): Special case for getting
Richard M. Stallman <rms@gnu.org>
parents:
9331
diff
changeset
|
1322 get rid of its intervals. */ |
14088
dc754f92a2a4
(Ftext_properties_at, Fget_text_property, Fget_char_property,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1323 if (NILP (properties) && STRINGP (object) |
9541
449e024f13be
(Fset_text_properties): Special case for getting
Richard M. Stallman <rms@gnu.org>
parents:
9331
diff
changeset
|
1324 && XFASTINT (start) == 0 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1325 && XFASTINT (end) == SCHARS (object)) |
9541
449e024f13be
(Fset_text_properties): Special case for getting
Richard M. Stallman <rms@gnu.org>
parents:
9331
diff
changeset
|
1326 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
1327 if (! STRING_INTERVALS (object)) |
67947
7538cafcf9f7
(set_text_properties): Reword description of return value.
Luc Teirlinck <teirllm@auburn.edu>
parents:
64770
diff
changeset
|
1328 return Qnil; |
16331
32a51f7ba384
(set_properties, add_properties, remove_properties):
Richard M. Stallman <rms@gnu.org>
parents:
16103
diff
changeset
|
1329 |
46381
ab2bd718aad6
* textprop.c (set_text_properties): Use STRING_SET_INTERVALS.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
1330 STRING_SET_INTERVALS (object, NULL_INTERVAL); |
9541
449e024f13be
(Fset_text_properties): Special case for getting
Richard M. Stallman <rms@gnu.org>
parents:
9331
diff
changeset
|
1331 return Qt; |
449e024f13be
(Fset_text_properties): Special case for getting
Richard M. Stallman <rms@gnu.org>
parents:
9331
diff
changeset
|
1332 } |
449e024f13be
(Fset_text_properties): Special case for getting
Richard M. Stallman <rms@gnu.org>
parents:
9331
diff
changeset
|
1333 |
8686 | 1334 i = validate_interval_range (object, &start, &end, soft); |
9541
449e024f13be
(Fset_text_properties): Special case for getting
Richard M. Stallman <rms@gnu.org>
parents:
9331
diff
changeset
|
1335 |
1029 | 1336 if (NULL_INTERVAL_P (i)) |
8686 | 1337 { |
14088
dc754f92a2a4
(Ftext_properties_at, Fget_text_property, Fget_char_property,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1338 /* If buffer has no properties, and we want none, return now. */ |
dc754f92a2a4
(Ftext_properties_at, Fget_text_property, Fget_char_property,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1339 if (NILP (properties)) |
8686 | 1340 return Qnil; |
1341 | |
9071
2d4d0f6e7be0
(syms_of_textprop): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8962
diff
changeset
|
1342 /* Restore the original START and END values |
2d4d0f6e7be0
(syms_of_textprop): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8962
diff
changeset
|
1343 because validate_interval_range increments them for strings. */ |
2d4d0f6e7be0
(syms_of_textprop): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8962
diff
changeset
|
1344 start = ostart; |
2d4d0f6e7be0
(syms_of_textprop): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8962
diff
changeset
|
1345 end = oend; |
2d4d0f6e7be0
(syms_of_textprop): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8962
diff
changeset
|
1346 |
8686 | 1347 i = validate_interval_range (object, &start, &end, hard); |
1348 /* This can return if start == end. */ | |
1349 if (NULL_INTERVAL_P (i)) | |
1350 return Qnil; | |
1351 } | |
1029 | 1352 |
106904
943a92f3710b
Fix spurious before-change-functions invocation from (insert ?\n).
Alan Mackenzie <acm@muc.de>
parents:
105877
diff
changeset
|
1353 if (BUFFERP (object) && !NILP (coherent_change_p)) |
72592
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
1354 modify_region (XBUFFER (object), XINT (start), XINT (end), 1); |
40921
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1355 |
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1356 set_text_properties_1 (start, end, properties, object, i); |
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1357 |
106904
943a92f3710b
Fix spurious before-change-functions invocation from (insert ?\n).
Alan Mackenzie <acm@muc.de>
parents:
105877
diff
changeset
|
1358 if (BUFFERP (object) && !NILP (coherent_change_p)) |
40921
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1359 signal_after_change (XINT (start), XINT (end) - XINT (start), |
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1360 XINT (end) - XINT (start)); |
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1361 return Qt; |
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1362 } |
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1363 |
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1364 /* Replace properties of text from START to END with new list of |
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1365 properties PROPERTIES. BUFFER is the buffer containing |
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1366 the text. This does not obey any hooks. |
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1367 You can provide the interval that START is located in as I, |
41532
afe70a164d3b
(set_text_properties_1): Clearly mark that the interval should not be empty.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41391
diff
changeset
|
1368 or pass NULL for I and this function will find it. |
41589
67d2bb283076
(set_text_properties_1): Allow args in either order.
Richard M. Stallman <rms@gnu.org>
parents:
41532
diff
changeset
|
1369 START and END can be in any order. */ |
40921
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1370 |
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1371 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1372 set_text_properties_1 (Lisp_Object start, Lisp_Object end, Lisp_Object properties, Lisp_Object buffer, INTERVAL i) |
40921
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1373 { |
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1374 register INTERVAL prev_changed = NULL_INTERVAL; |
110564
08d10ad776d8
Fix int/EMACS_INT use in textprop.c and window.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109179
diff
changeset
|
1375 register EMACS_INT s, len; |
40921
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1376 INTERVAL unchanged; |
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1377 |
1029 | 1378 s = XINT (start); |
1379 len = XINT (end) - s; | |
41589
67d2bb283076
(set_text_properties_1): Allow args in either order.
Richard M. Stallman <rms@gnu.org>
parents:
41532
diff
changeset
|
1380 if (len == 0) |
67d2bb283076
(set_text_properties_1): Allow args in either order.
Richard M. Stallman <rms@gnu.org>
parents:
41532
diff
changeset
|
1381 return; |
67d2bb283076
(set_text_properties_1): Allow args in either order.
Richard M. Stallman <rms@gnu.org>
parents:
41532
diff
changeset
|
1382 if (len < 0) |
67d2bb283076
(set_text_properties_1): Allow args in either order.
Richard M. Stallman <rms@gnu.org>
parents:
41532
diff
changeset
|
1383 { |
67d2bb283076
(set_text_properties_1): Allow args in either order.
Richard M. Stallman <rms@gnu.org>
parents:
41532
diff
changeset
|
1384 s = s + len; |
67d2bb283076
(set_text_properties_1): Allow args in either order.
Richard M. Stallman <rms@gnu.org>
parents:
41532
diff
changeset
|
1385 len = - len; |
67d2bb283076
(set_text_properties_1): Allow args in either order.
Richard M. Stallman <rms@gnu.org>
parents:
41532
diff
changeset
|
1386 } |
67d2bb283076
(set_text_properties_1): Allow args in either order.
Richard M. Stallman <rms@gnu.org>
parents:
41532
diff
changeset
|
1387 |
40921
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1388 if (i == 0) |
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1389 i = find_interval (BUF_INTERVALS (XBUFFER (buffer)), s); |
16331
32a51f7ba384
(set_properties, add_properties, remove_properties):
Richard M. Stallman <rms@gnu.org>
parents:
16103
diff
changeset
|
1390 |
1029 | 1391 if (i->position != s) |
1392 { | |
1393 unchanged = i; | |
4144
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1394 i = split_interval_right (unchanged, s - unchanged->position); |
1272
bfd04f61eb16
Mods to Ferase_text_properties
Joseph Arceneaux <jla@gnu.org>
parents:
1211
diff
changeset
|
1395 |
1029 | 1396 if (LENGTH (i) > len) |
1397 { | |
1211 | 1398 copy_properties (unchanged, i); |
4144
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1399 i = split_interval_left (i, len); |
40921
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1400 set_properties (properties, i, buffer); |
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1401 return; |
1029 | 1402 } |
1403 | |
40921
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1404 set_properties (properties, i, buffer); |
3553
5f9688c0b704
(Fadd_text_properties): Don't treat the initial
Richard M. Stallman <rms@gnu.org>
parents:
2783
diff
changeset
|
1405 |
1211 | 1406 if (LENGTH (i) == len) |
40921
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1407 return; |
1211 | 1408 |
1409 prev_changed = i; | |
1029 | 1410 len -= LENGTH (i); |
1411 i = next_interval (i); | |
1412 } | |
1413 | |
1283
6f4cbcc62eba
Minor optimizations of Fset_text_properties and Ferase_text_properties.
Joseph Arceneaux <jla@gnu.org>
parents:
1272
diff
changeset
|
1414 /* We are starting at the beginning of an interval, I */ |
1272
bfd04f61eb16
Mods to Ferase_text_properties
Joseph Arceneaux <jla@gnu.org>
parents:
1211
diff
changeset
|
1415 while (len > 0) |
1029 | 1416 { |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
1417 if (i == 0) |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
1418 abort (); |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
1419 |
1029 | 1420 if (LENGTH (i) >= len) |
1421 { | |
1283
6f4cbcc62eba
Minor optimizations of Fset_text_properties and Ferase_text_properties.
Joseph Arceneaux <jla@gnu.org>
parents:
1272
diff
changeset
|
1422 if (LENGTH (i) > len) |
4144
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1423 i = split_interval_left (i, len); |
1029 | 1424 |
13585
dc00b7be6593
(Fset_text_properties): Call set_properties
Richard M. Stallman <rms@gnu.org>
parents:
13265
diff
changeset
|
1425 /* We have to call set_properties even if we are going to |
dc00b7be6593
(Fset_text_properties): Call set_properties
Richard M. Stallman <rms@gnu.org>
parents:
13265
diff
changeset
|
1426 merge the intervals, so as to make the undo records |
dc00b7be6593
(Fset_text_properties): Call set_properties
Richard M. Stallman <rms@gnu.org>
parents:
13265
diff
changeset
|
1427 and cause redisplay to happen. */ |
40921
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1428 set_properties (properties, i, buffer); |
13585
dc00b7be6593
(Fset_text_properties): Call set_properties
Richard M. Stallman <rms@gnu.org>
parents:
13265
diff
changeset
|
1429 if (!NULL_INTERVAL_P (prev_changed)) |
1211 | 1430 merge_interval_left (i); |
40921
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1431 return; |
1029 | 1432 } |
1433 | |
1434 len -= LENGTH (i); | |
13585
dc00b7be6593
(Fset_text_properties): Call set_properties
Richard M. Stallman <rms@gnu.org>
parents:
13265
diff
changeset
|
1435 |
dc00b7be6593
(Fset_text_properties): Call set_properties
Richard M. Stallman <rms@gnu.org>
parents:
13265
diff
changeset
|
1436 /* We have to call set_properties even if we are going to |
dc00b7be6593
(Fset_text_properties): Call set_properties
Richard M. Stallman <rms@gnu.org>
parents:
13265
diff
changeset
|
1437 merge the intervals, so as to make the undo records |
dc00b7be6593
(Fset_text_properties): Call set_properties
Richard M. Stallman <rms@gnu.org>
parents:
13265
diff
changeset
|
1438 and cause redisplay to happen. */ |
40921
95756d215716
(set_text_properties_1): New subroutine, broken out of set_text_properties.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
1439 set_properties (properties, i, buffer); |
1211 | 1440 if (NULL_INTERVAL_P (prev_changed)) |
13585
dc00b7be6593
(Fset_text_properties): Call set_properties
Richard M. Stallman <rms@gnu.org>
parents:
13265
diff
changeset
|
1441 prev_changed = i; |
1211 | 1442 else |
1443 prev_changed = i = merge_interval_left (i); | |
1444 | |
1029 | 1445 i = next_interval (i); |
1446 } | |
1447 } | |
1448 | |
1449 DEFUN ("remove-text-properties", Fremove_text_properties, | |
1857
9d65dfc7bdb7
(Fadd_text_properties): Put OBJECT arg last. Make it optional.
Richard M. Stallman <rms@gnu.org>
parents:
1715
diff
changeset
|
1450 Sremove_text_properties, 3, 4, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1451 doc: /* Remove some properties from text from START to END. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1452 The third argument PROPERTIES is a property list |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1453 whose property names specify the properties to remove. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1454 \(The values stored in PROPERTIES are ignored.) |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1455 If the optional fourth argument OBJECT is a buffer (or nil, which means |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1456 the current buffer), START and END are buffer positions (integers or |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1457 markers). If OBJECT is a string, START and END are 0-based indices into it. |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1458 Return t if any property was actually removed, nil otherwise. |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1459 |
95453
ca950c418cdd
(syms_of_textprop) <text-property-default-nonsticky>:
Juanma Barranquero <lekktu@gmail.com>
parents:
94963
diff
changeset
|
1460 Use `set-text-properties' if you want to remove all text properties. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1461 (Lisp_Object start, Lisp_Object end, Lisp_Object properties, Lisp_Object object) |
1029 | 1462 { |
1463 register INTERVAL i, unchanged; | |
110564
08d10ad776d8
Fix int/EMACS_INT use in textprop.c and window.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109179
diff
changeset
|
1464 register EMACS_INT s, len; |
08d10ad776d8
Fix int/EMACS_INT use in textprop.c and window.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109179
diff
changeset
|
1465 register int modified = 0; |
1029 | 1466 |
1857
9d65dfc7bdb7
(Fadd_text_properties): Put OBJECT arg last. Make it optional.
Richard M. Stallman <rms@gnu.org>
parents:
1715
diff
changeset
|
1467 if (NILP (object)) |
9280
4b238c43e59f
(Ftext_properties_at, Fget_char_property, Fnext_property_change,
Karl Heuer <kwzh@gnu.org>
parents:
9109
diff
changeset
|
1468 XSETBUFFER (object, current_buffer); |
1857
9d65dfc7bdb7
(Fadd_text_properties): Put OBJECT arg last. Make it optional.
Richard M. Stallman <rms@gnu.org>
parents:
1715
diff
changeset
|
1469 |
1029 | 1470 i = validate_interval_range (object, &start, &end, soft); |
1471 if (NULL_INTERVAL_P (i)) | |
1472 return Qnil; | |
1473 | |
1474 s = XINT (start); | |
1475 len = XINT (end) - s; | |
1211 | 1476 |
1029 | 1477 if (i->position != s) |
1478 { | |
1479 /* No properties on this first interval -- return if | |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
1480 it covers the entire region. */ |
14088
dc754f92a2a4
(Ftext_properties_at, Fget_text_property, Fget_char_property,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1481 if (! interval_has_some_properties (properties, i)) |
1029 | 1482 { |
110564
08d10ad776d8
Fix int/EMACS_INT use in textprop.c and window.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109179
diff
changeset
|
1483 EMACS_INT got = (LENGTH (i) - (s - i->position)); |
1029 | 1484 if (got >= len) |
1485 return Qnil; | |
1486 len -= got; | |
3858
e07d474bdba9
(Fremove_text_properties, Fadd_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
3698
diff
changeset
|
1487 i = next_interval (i); |
1029 | 1488 } |
3553
5f9688c0b704
(Fadd_text_properties): Don't treat the initial
Richard M. Stallman <rms@gnu.org>
parents:
2783
diff
changeset
|
1489 /* Split away the beginning of this interval; what we don't |
5f9688c0b704
(Fadd_text_properties): Don't treat the initial
Richard M. Stallman <rms@gnu.org>
parents:
2783
diff
changeset
|
1490 want to modify. */ |
1029 | 1491 else |
1492 { | |
1493 unchanged = i; | |
4144
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1494 i = split_interval_right (unchanged, s - unchanged->position); |
1029 | 1495 copy_properties (unchanged, i); |
1496 } | |
1497 } | |
1498 | |
16339
abcd50093b4e
(Fset_text_properties, Fadd_text_properties)
Richard M. Stallman <rms@gnu.org>
parents:
16331
diff
changeset
|
1499 if (BUFFERP (object)) |
72592
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
1500 modify_region (XBUFFER (object), XINT (start), XINT (end), 1); |
16331
32a51f7ba384
(set_properties, add_properties, remove_properties):
Richard M. Stallman <rms@gnu.org>
parents:
16103
diff
changeset
|
1501 |
1029 | 1502 /* We are at the beginning of an interval, with len to scan */ |
2124
54179ef9ce35
* textprop.c (Fadd_text_properties): Initialize the modified flag.
Jim Blandy <jimb@redhat.com>
parents:
2058
diff
changeset
|
1503 for (;;) |
1029 | 1504 { |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
1505 if (i == 0) |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
1506 abort (); |
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
1507 |
1029 | 1508 if (LENGTH (i) >= len) |
1509 { | |
14088
dc754f92a2a4
(Ftext_properties_at, Fget_text_property, Fget_char_property,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1510 if (! interval_has_some_properties (properties, i)) |
1029 | 1511 return modified ? Qt : Qnil; |
1512 | |
1513 if (LENGTH (i) == len) | |
1514 { | |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1515 remove_properties (properties, Qnil, i, object); |
16339
abcd50093b4e
(Fset_text_properties, Fadd_text_properties)
Richard M. Stallman <rms@gnu.org>
parents:
16331
diff
changeset
|
1516 if (BUFFERP (object)) |
abcd50093b4e
(Fset_text_properties, Fadd_text_properties)
Richard M. Stallman <rms@gnu.org>
parents:
16331
diff
changeset
|
1517 signal_after_change (XINT (start), XINT (end) - XINT (start), |
abcd50093b4e
(Fset_text_properties, Fadd_text_properties)
Richard M. Stallman <rms@gnu.org>
parents:
16331
diff
changeset
|
1518 XINT (end) - XINT (start)); |
1029 | 1519 return Qt; |
1520 } | |
1521 | |
1522 /* i has the properties, and goes past the change limit */ | |
3553
5f9688c0b704
(Fadd_text_properties): Don't treat the initial
Richard M. Stallman <rms@gnu.org>
parents:
2783
diff
changeset
|
1523 unchanged = i; |
4144
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1524 i = split_interval_left (i, len); |
1029 | 1525 copy_properties (unchanged, i); |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1526 remove_properties (properties, Qnil, i, object); |
16339
abcd50093b4e
(Fset_text_properties, Fadd_text_properties)
Richard M. Stallman <rms@gnu.org>
parents:
16331
diff
changeset
|
1527 if (BUFFERP (object)) |
abcd50093b4e
(Fset_text_properties, Fadd_text_properties)
Richard M. Stallman <rms@gnu.org>
parents:
16331
diff
changeset
|
1528 signal_after_change (XINT (start), XINT (end) - XINT (start), |
abcd50093b4e
(Fset_text_properties, Fadd_text_properties)
Richard M. Stallman <rms@gnu.org>
parents:
16331
diff
changeset
|
1529 XINT (end) - XINT (start)); |
1029 | 1530 return Qt; |
1531 } | |
1532 | |
1533 len -= LENGTH (i); | |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1534 modified += remove_properties (properties, Qnil, i, object); |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1535 i = next_interval (i); |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1536 } |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1537 } |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1538 |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1539 DEFUN ("remove-list-of-text-properties", Fremove_list_of_text_properties, |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1540 Sremove_list_of_text_properties, 3, 4, 0, |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1541 doc: /* Remove some properties from text from START to END. |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1542 The third argument LIST-OF-PROPERTIES is a list of property names to remove. |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1543 If the optional fourth argument OBJECT is a buffer (or nil, which means |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1544 the current buffer), START and END are buffer positions (integers or |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1545 markers). If OBJECT is a string, START and END are 0-based indices into it. |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1546 Return t if any property was actually removed, nil otherwise. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1547 (Lisp_Object start, Lisp_Object end, Lisp_Object list_of_properties, Lisp_Object object) |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1548 { |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1549 register INTERVAL i, unchanged; |
110564
08d10ad776d8
Fix int/EMACS_INT use in textprop.c and window.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109179
diff
changeset
|
1550 register EMACS_INT s, len; |
08d10ad776d8
Fix int/EMACS_INT use in textprop.c and window.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109179
diff
changeset
|
1551 register int modified = 0; |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1552 Lisp_Object properties; |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1553 properties = list_of_properties; |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1554 |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1555 if (NILP (object)) |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1556 XSETBUFFER (object, current_buffer); |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1557 |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1558 i = validate_interval_range (object, &start, &end, soft); |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1559 if (NULL_INTERVAL_P (i)) |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1560 return Qnil; |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1561 |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1562 s = XINT (start); |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1563 len = XINT (end) - s; |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1564 |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1565 if (i->position != s) |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1566 { |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1567 /* No properties on this first interval -- return if |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1568 it covers the entire region. */ |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1569 if (! interval_has_some_properties_list (properties, i)) |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1570 { |
110564
08d10ad776d8
Fix int/EMACS_INT use in textprop.c and window.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109179
diff
changeset
|
1571 EMACS_INT got = (LENGTH (i) - (s - i->position)); |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1572 if (got >= len) |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1573 return Qnil; |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1574 len -= got; |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1575 i = next_interval (i); |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1576 } |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1577 /* Split away the beginning of this interval; what we don't |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1578 want to modify. */ |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1579 else |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1580 { |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1581 unchanged = i; |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1582 i = split_interval_right (unchanged, s - unchanged->position); |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1583 copy_properties (unchanged, i); |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1584 } |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1585 } |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1586 |
70129
af8798ce814c
(Fremove_list_of_text_properties): Ensure
Lars Hansen <larsh@soem.dk>
parents:
68651
diff
changeset
|
1587 /* We are at the beginning of an interval, with len to scan. |
af8798ce814c
(Fremove_list_of_text_properties): Ensure
Lars Hansen <larsh@soem.dk>
parents:
68651
diff
changeset
|
1588 The flag `modified' records if changes have been made. |
af8798ce814c
(Fremove_list_of_text_properties): Ensure
Lars Hansen <larsh@soem.dk>
parents:
68651
diff
changeset
|
1589 When object is a buffer, we must call modify_region before changes are |
af8798ce814c
(Fremove_list_of_text_properties): Ensure
Lars Hansen <larsh@soem.dk>
parents:
68651
diff
changeset
|
1590 made and signal_after_change when we are done. |
78501 | 1591 We call modify_region before calling remove_properties if modified == 0, |
1592 and we call signal_after_change before returning if modified != 0. */ | |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1593 for (;;) |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1594 { |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1595 if (i == 0) |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1596 abort (); |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1597 |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1598 if (LENGTH (i) >= len) |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1599 { |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1600 if (! interval_has_some_properties_list (properties, i)) |
111997
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1601 { |
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1602 if (modified) |
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1603 { |
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1604 if (BUFFERP (object)) |
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1605 signal_after_change (XINT (start), |
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1606 XINT (end) - XINT (start), |
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1607 XINT (end) - XINT (start)); |
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1608 return Qt; |
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1609 } |
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1610 else |
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1611 return Qnil; |
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1612 } |
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1613 else if (LENGTH (i) == len) |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1614 { |
70129
af8798ce814c
(Fremove_list_of_text_properties): Ensure
Lars Hansen <larsh@soem.dk>
parents:
68651
diff
changeset
|
1615 if (!modified && BUFFERP (object)) |
72592
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
1616 modify_region (XBUFFER (object), XINT (start), XINT (end), 1); |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1617 remove_properties (Qnil, properties, i, object); |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1618 if (BUFFERP (object)) |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1619 signal_after_change (XINT (start), XINT (end) - XINT (start), |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1620 XINT (end) - XINT (start)); |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1621 return Qt; |
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1622 } |
111997
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1623 else |
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1624 { /* i has the properties, and goes past the change limit. */ |
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1625 unchanged = i; |
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1626 i = split_interval_left (i, len); |
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1627 copy_properties (unchanged, i); |
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1628 if (!modified && BUFFERP (object)) |
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1629 modify_region (XBUFFER (object), XINT (start), XINT (end), 1); |
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1630 remove_properties (Qnil, properties, i, object); |
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1631 if (BUFFERP (object)) |
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1632 signal_after_change (XINT (start), XINT (end) - XINT (start), |
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1633 XINT (end) - XINT (start)); |
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1634 return Qt; |
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110564
diff
changeset
|
1635 } |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1636 } |
70129
af8798ce814c
(Fremove_list_of_text_properties): Ensure
Lars Hansen <larsh@soem.dk>
parents:
68651
diff
changeset
|
1637 if (interval_has_some_properties_list (properties, i)) |
af8798ce814c
(Fremove_list_of_text_properties): Ensure
Lars Hansen <larsh@soem.dk>
parents:
68651
diff
changeset
|
1638 { |
af8798ce814c
(Fremove_list_of_text_properties): Ensure
Lars Hansen <larsh@soem.dk>
parents:
68651
diff
changeset
|
1639 if (!modified && BUFFERP (object)) |
72592
f6de516bbb4b
* buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents:
72005
diff
changeset
|
1640 modify_region (XBUFFER (object), XINT (start), XINT (end), 1); |
70129
af8798ce814c
(Fremove_list_of_text_properties): Ensure
Lars Hansen <larsh@soem.dk>
parents:
68651
diff
changeset
|
1641 remove_properties (Qnil, properties, i, object); |
af8798ce814c
(Fremove_list_of_text_properties): Ensure
Lars Hansen <larsh@soem.dk>
parents:
68651
diff
changeset
|
1642 modified = 1; |
af8798ce814c
(Fremove_list_of_text_properties): Ensure
Lars Hansen <larsh@soem.dk>
parents:
68651
diff
changeset
|
1643 } |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
1644 len -= LENGTH (i); |
1029 | 1645 i = next_interval (i); |
1646 } | |
1647 } | |
16679
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
1648 |
4144
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1649 DEFUN ("text-property-any", Ftext_property_any, |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1650 Stext_property_any, 4, 5, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1651 doc: /* Check text from START to END for property PROPERTY equalling VALUE. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1652 If so, return the position of the first character whose property PROPERTY |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1653 is `eq' to VALUE. Otherwise return nil. |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1654 If the optional fifth argument OBJECT is a buffer (or nil, which means |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1655 the current buffer), START and END are buffer positions (integers or |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1656 markers). If OBJECT is a string, START and END are 0-based indices into it. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1657 (Lisp_Object start, Lisp_Object end, Lisp_Object property, Lisp_Object value, Lisp_Object object) |
4144
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1658 { |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1659 register INTERVAL i; |
110564
08d10ad776d8
Fix int/EMACS_INT use in textprop.c and window.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109179
diff
changeset
|
1660 register EMACS_INT e, pos; |
4144
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1661 |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1662 if (NILP (object)) |
9280
4b238c43e59f
(Ftext_properties_at, Fget_char_property, Fnext_property_change,
Karl Heuer <kwzh@gnu.org>
parents:
9109
diff
changeset
|
1663 XSETBUFFER (object, current_buffer); |
4144
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1664 i = validate_interval_range (object, &start, &end, soft); |
10488
701e7acfe885
(Ftext_property_any): Handle the trivial case specially.
Karl Heuer <kwzh@gnu.org>
parents:
10312
diff
changeset
|
1665 if (NULL_INTERVAL_P (i)) |
701e7acfe885
(Ftext_property_any): Handle the trivial case specially.
Karl Heuer <kwzh@gnu.org>
parents:
10312
diff
changeset
|
1666 return (!NILP (value) || EQ (start, end) ? Qnil : start); |
4144
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1667 e = XINT (end); |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1668 |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1669 while (! NULL_INTERVAL_P (i)) |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1670 { |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1671 if (i->position >= e) |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1672 break; |
14088
dc754f92a2a4
(Ftext_properties_at, Fget_text_property, Fget_char_property,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1673 if (EQ (textget (i->plist, property), value)) |
4144
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1674 { |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1675 pos = i->position; |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1676 if (pos < XINT (start)) |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1677 pos = XINT (start); |
22344
2ec50b4767ed
Handle the new convention that `position' values
Karl Heuer <kwzh@gnu.org>
parents:
22280
diff
changeset
|
1678 return make_number (pos); |
4144
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1679 } |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1680 i = next_interval (i); |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1681 } |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1682 return Qnil; |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1683 } |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1684 |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1685 DEFUN ("text-property-not-all", Ftext_property_not_all, |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1686 Stext_property_not_all, 4, 5, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1687 doc: /* Check text from START to END for property PROPERTY not equalling VALUE. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1688 If so, return the position of the first character whose property PROPERTY |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1689 is not `eq' to VALUE. Otherwise, return nil. |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1690 If the optional fifth argument OBJECT is a buffer (or nil, which means |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1691 the current buffer), START and END are buffer positions (integers or |
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1692 markers). If OBJECT is a string, START and END are 0-based indices into it. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1693 (Lisp_Object start, Lisp_Object end, Lisp_Object property, Lisp_Object value, Lisp_Object object) |
4144
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1694 { |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1695 register INTERVAL i; |
110564
08d10ad776d8
Fix int/EMACS_INT use in textprop.c and window.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109179
diff
changeset
|
1696 register EMACS_INT s, e; |
4144
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1697 |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1698 if (NILP (object)) |
9280
4b238c43e59f
(Ftext_properties_at, Fget_char_property, Fnext_property_change,
Karl Heuer <kwzh@gnu.org>
parents:
9109
diff
changeset
|
1699 XSETBUFFER (object, current_buffer); |
4144
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1700 i = validate_interval_range (object, &start, &end, soft); |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1701 if (NULL_INTERVAL_P (i)) |
5114
b37f62d72049
(Ftext_property_not_all): For trivial yes, return start, not Qt.
Richard M. Stallman <rms@gnu.org>
parents:
5086
diff
changeset
|
1702 return (NILP (value) || EQ (start, end)) ? Qnil : start; |
4144
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1703 s = XINT (start); |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1704 e = XINT (end); |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1705 |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1706 while (! NULL_INTERVAL_P (i)) |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1707 { |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1708 if (i->position >= e) |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1709 break; |
14088
dc754f92a2a4
(Ftext_properties_at, Fget_text_property, Fget_char_property,
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
1710 if (! EQ (textget (i->plist, property), value)) |
4144
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1711 { |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1712 if (i->position > s) |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1713 s = i->position; |
22344
2ec50b4767ed
Handle the new convention that `position' values
Karl Heuer <kwzh@gnu.org>
parents:
22280
diff
changeset
|
1714 return make_number (s); |
4144
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1715 } |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1716 i = next_interval (i); |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1717 } |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1718 return Qnil; |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
1719 } |
43896
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1720 |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1721 |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1722 /* Return the direction from which the text-property PROP would be |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1723 inherited by any new text inserted at POS: 1 if it would be |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1724 inherited from the char after POS, -1 if it would be inherited from |
51041
4370ce3fabb3
(text_property_stickiness): New arg `buffer'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49247
diff
changeset
|
1725 the char before POS, and 0 if from neither. |
4370ce3fabb3
(text_property_stickiness): New arg `buffer'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49247
diff
changeset
|
1726 BUFFER can be either a buffer or nil (meaning current buffer). */ |
43896
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1727 |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1728 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1729 text_property_stickiness (Lisp_Object prop, Lisp_Object pos, Lisp_Object buffer) |
43896
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1730 { |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1731 Lisp_Object prev_pos, front_sticky; |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1732 int is_rear_sticky = 1, is_front_sticky = 0; /* defaults */ |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1733 |
51041
4370ce3fabb3
(text_property_stickiness): New arg `buffer'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49247
diff
changeset
|
1734 if (NILP (buffer)) |
4370ce3fabb3
(text_property_stickiness): New arg `buffer'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49247
diff
changeset
|
1735 XSETBUFFER (buffer, current_buffer); |
4370ce3fabb3
(text_property_stickiness): New arg `buffer'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49247
diff
changeset
|
1736 |
4370ce3fabb3
(text_property_stickiness): New arg `buffer'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49247
diff
changeset
|
1737 if (XINT (pos) > BUF_BEGV (XBUFFER (buffer))) |
43896
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1738 /* Consider previous character. */ |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1739 { |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1740 Lisp_Object rear_non_sticky; |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1741 |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1742 prev_pos = make_number (XINT (pos) - 1); |
51041
4370ce3fabb3
(text_property_stickiness): New arg `buffer'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49247
diff
changeset
|
1743 rear_non_sticky = Fget_text_property (prev_pos, Qrear_nonsticky, buffer); |
43896
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1744 |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1745 if (!NILP (CONSP (rear_non_sticky) |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1746 ? Fmemq (prop, rear_non_sticky) |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1747 : rear_non_sticky)) |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1748 /* PROP is rear-non-sticky. */ |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1749 is_rear_sticky = 0; |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1750 } |
71499
51f7fe4f6552
* textprop.c (text_property_stickiness): doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70656
diff
changeset
|
1751 else |
51f7fe4f6552
* textprop.c (text_property_stickiness): doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70656
diff
changeset
|
1752 return 0; |
43896
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1753 |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1754 /* Consider following character. */ |
71499
51f7fe4f6552
* textprop.c (text_property_stickiness): doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70656
diff
changeset
|
1755 /* This signals an arg-out-of-range error if pos is outside the |
51f7fe4f6552
* textprop.c (text_property_stickiness): doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70656
diff
changeset
|
1756 buffer's accessible range. */ |
51041
4370ce3fabb3
(text_property_stickiness): New arg `buffer'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49247
diff
changeset
|
1757 front_sticky = Fget_text_property (pos, Qfront_sticky, buffer); |
43896
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1758 |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1759 if (EQ (front_sticky, Qt) |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1760 || (CONSP (front_sticky) |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1761 && !NILP (Fmemq (prop, front_sticky)))) |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1762 /* PROP is inherited from after. */ |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1763 is_front_sticky = 1; |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1764 |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1765 /* Simple cases, where the properties are consistent. */ |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1766 if (is_rear_sticky && !is_front_sticky) |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1767 return -1; |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1768 else if (!is_rear_sticky && is_front_sticky) |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1769 return 1; |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1770 else if (!is_rear_sticky && !is_front_sticky) |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1771 return 0; |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1772 |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1773 /* The stickiness properties are inconsistent, so we have to |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1774 disambiguate. Basically, rear-sticky wins, _except_ if the |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1775 property that would be inherited has a value of nil, in which case |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1776 front-sticky wins. */ |
51041
4370ce3fabb3
(text_property_stickiness): New arg `buffer'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49247
diff
changeset
|
1777 if (XINT (pos) == BUF_BEGV (XBUFFER (buffer)) |
4370ce3fabb3
(text_property_stickiness): New arg `buffer'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49247
diff
changeset
|
1778 || NILP (Fget_text_property (prev_pos, prop, buffer))) |
43896
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1779 return 1; |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1780 else |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1781 return -1; |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1782 } |
fccc867cca64
(text_property_stickiness): Function moved here from `editfns.c'.
Miles Bader <miles@gnu.org>
parents:
42967
diff
changeset
|
1783 |
16679
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
1784 |
4007
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1785 /* I don't think this is the right interface to export; how often do you |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1786 want to do something like this, other than when you're copying objects |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1787 around? |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1788 |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1789 I think it would be better to have a pair of functions, one which |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1790 returns the text properties of a region as a list of ranges and |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1791 plists, and another which applies such a list to another object. */ |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1792 |
10159
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1793 /* Add properties from SRC to SRC of SRC, starting at POS in DEST. |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1794 SRC and DEST may each refer to strings or buffers. |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1795 Optional sixth argument PROP causes only that property to be copied. |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1796 Properties are copied to DEST as if by `add-text-properties'. |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1797 Return t if any property value actually changed, nil otherwise. */ |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1798 |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1799 /* Note this can GC when DEST is a buffer. */ |
22344
2ec50b4767ed
Handle the new convention that `position' values
Karl Heuer <kwzh@gnu.org>
parents:
22280
diff
changeset
|
1800 |
4007
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1801 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1802 copy_text_properties (Lisp_Object start, Lisp_Object end, Lisp_Object src, Lisp_Object pos, Lisp_Object dest, Lisp_Object prop) |
4007
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1803 { |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1804 INTERVAL i; |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1805 Lisp_Object res; |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1806 Lisp_Object stuff; |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1807 Lisp_Object plist; |
110564
08d10ad776d8
Fix int/EMACS_INT use in textprop.c and window.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109179
diff
changeset
|
1808 EMACS_INT s, e, e2, p, len; |
08d10ad776d8
Fix int/EMACS_INT use in textprop.c and window.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109179
diff
changeset
|
1809 int modified = 0; |
10159
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1810 struct gcpro gcpro1, gcpro2; |
4007
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1811 |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1812 i = validate_interval_range (src, &start, &end, soft); |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1813 if (NULL_INTERVAL_P (i)) |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1814 return Qnil; |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1815 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40647
diff
changeset
|
1816 CHECK_NUMBER_COERCE_MARKER (pos); |
4007
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1817 { |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1818 Lisp_Object dest_start, dest_end; |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1819 |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1820 dest_start = pos; |
9321
e6759002383c
(Fnext_property_change, property_change_between_p,
Karl Heuer <kwzh@gnu.org>
parents:
9280
diff
changeset
|
1821 XSETFASTINT (dest_end, XINT (dest_start) + (XINT (end) - XINT (start))); |
4007
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1822 /* Apply this to a copy of pos; it will try to increment its arguments, |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1823 which we don't want. */ |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1824 validate_interval_range (dest, &dest_start, &dest_end, soft); |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1825 } |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1826 |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1827 s = XINT (start); |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1828 e = XINT (end); |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1829 p = XINT (pos); |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1830 |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1831 stuff = Qnil; |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1832 |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1833 while (s < e) |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1834 { |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1835 e2 = i->position + LENGTH (i); |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1836 if (e2 > e) |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1837 e2 = e; |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1838 len = e2 - s; |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1839 |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1840 plist = i->plist; |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1841 if (! NILP (prop)) |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1842 while (! NILP (plist)) |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1843 { |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1844 if (EQ (Fcar (plist), prop)) |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1845 { |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1846 plist = Fcons (prop, Fcons (Fcar (Fcdr (plist)), Qnil)); |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1847 break; |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1848 } |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1849 plist = Fcdr (Fcdr (plist)); |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1850 } |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1851 if (! NILP (plist)) |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1852 { |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1853 /* Must defer modifications to the interval tree in case src |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
1854 and dest refer to the same string or buffer. */ |
4007
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1855 stuff = Fcons (Fcons (make_number (p), |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1856 Fcons (make_number (p + len), |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1857 Fcons (plist, Qnil))), |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1858 stuff); |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1859 } |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1860 |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1861 i = next_interval (i); |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1862 if (NULL_INTERVAL_P (i)) |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1863 break; |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1864 |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1865 p += len; |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1866 s = i->position; |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1867 } |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1868 |
10159
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1869 GCPRO2 (stuff, dest); |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1870 |
4007
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1871 while (! NILP (stuff)) |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1872 { |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1873 res = Fcar (stuff); |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1874 res = Fadd_text_properties (Fcar (res), Fcar (Fcdr (res)), |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1875 Fcar (Fcdr (Fcdr (res))), dest); |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1876 if (! NILP (res)) |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1877 modified++; |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1878 stuff = Fcdr (stuff); |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1879 } |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1880 |
10159
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1881 UNGCPRO; |
1299d37b51bb
(add_properties): Add gcpro's.
Richard M. Stallman <rms@gnu.org>
parents:
9945
diff
changeset
|
1882 |
4007
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1883 return modified ? Qt : Qnil; |
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1884 } |
25000 | 1885 |
1886 | |
1887 /* Return a list representing the text properties of OBJECT between | |
1888 START and END. if PROP is non-nil, report only on that property. | |
1889 Each result list element has the form (S E PLIST), where S and E | |
1890 are positions in OBJECT and PLIST is a property list containing the | |
1891 text properties of OBJECT between S and E. Value is nil if OBJECT | |
1892 doesn't contain text properties between START and END. */ | |
1893 | |
1894 Lisp_Object | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1895 text_property_list (Lisp_Object object, Lisp_Object start, Lisp_Object end, Lisp_Object prop) |
25000 | 1896 { |
1897 struct interval *i; | |
1898 Lisp_Object result; | |
1899 | |
1900 result = Qnil; | |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1901 |
25000 | 1902 i = validate_interval_range (object, &start, &end, soft); |
1903 if (!NULL_INTERVAL_P (i)) | |
1904 { | |
110564
08d10ad776d8
Fix int/EMACS_INT use in textprop.c and window.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109179
diff
changeset
|
1905 EMACS_INT s = XINT (start); |
08d10ad776d8
Fix int/EMACS_INT use in textprop.c and window.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109179
diff
changeset
|
1906 EMACS_INT e = XINT (end); |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1907 |
25000 | 1908 while (s < e) |
1909 { | |
110564
08d10ad776d8
Fix int/EMACS_INT use in textprop.c and window.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109179
diff
changeset
|
1910 EMACS_INT interval_end, len; |
25000 | 1911 Lisp_Object plist; |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1912 |
25000 | 1913 interval_end = i->position + LENGTH (i); |
1914 if (interval_end > e) | |
1915 interval_end = e; | |
1916 len = interval_end - s; | |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1917 |
25000 | 1918 plist = i->plist; |
1919 | |
1920 if (!NILP (prop)) | |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
1921 for (; CONSP (plist); plist = Fcdr (XCDR (plist))) |
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
1922 if (EQ (XCAR (plist), prop)) |
25000 | 1923 { |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78501
diff
changeset
|
1924 plist = Fcons (prop, Fcons (Fcar (XCDR (plist)), Qnil)); |
25000 | 1925 break; |
1926 } | |
1927 | |
1928 if (!NILP (plist)) | |
1929 result = Fcons (Fcons (make_number (s), | |
1930 Fcons (make_number (s + len), | |
1931 Fcons (plist, Qnil))), | |
1932 result); | |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1933 |
25000 | 1934 i = next_interval (i); |
1935 if (NULL_INTERVAL_P (i)) | |
1936 break; | |
1937 s = i->position; | |
1938 } | |
1939 } | |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1940 |
25000 | 1941 return result; |
1942 } | |
1943 | |
1944 | |
1945 /* Add text properties to OBJECT from LIST. LIST is a list of triples | |
1946 (START END PLIST), where START and END are positions and PLIST is a | |
1947 property list containing the text properties to add. Adjust START | |
1948 and END positions by DELTA before adding properties. Value is | |
1949 non-zero if OBJECT was modified. */ | |
1950 | |
1951 int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1952 add_text_properties_from_list (Lisp_Object object, Lisp_Object list, Lisp_Object delta) |
25000 | 1953 { |
1954 struct gcpro gcpro1, gcpro2; | |
1955 int modified_p = 0; | |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1956 |
25000 | 1957 GCPRO2 (list, object); |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1958 |
25000 | 1959 for (; CONSP (list); list = XCDR (list)) |
1960 { | |
1961 Lisp_Object item, start, end, plist, tem; | |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1962 |
25000 | 1963 item = XCAR (list); |
1964 start = make_number (XINT (XCAR (item)) + XINT (delta)); | |
1965 end = make_number (XINT (XCAR (XCDR (item))) + XINT (delta)); | |
1966 plist = XCAR (XCDR (XCDR (item))); | |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1967 |
25000 | 1968 tem = Fadd_text_properties (start, end, plist, object); |
1969 if (!NILP (tem)) | |
1970 modified_p = 1; | |
1971 } | |
1972 | |
1973 UNGCPRO; | |
1974 return modified_p; | |
1975 } | |
1976 | |
1977 | |
1978 | |
106780
85fd976607be
Fix bounds checking for text properties in `format' (Bug#5306).
Chong Yidong <cyd@stupidchicken.com>
parents:
105877
diff
changeset
|
1979 /* Modify end-points of ranges in LIST destructively, and return the |
85fd976607be
Fix bounds checking for text properties in `format' (Bug#5306).
Chong Yidong <cyd@stupidchicken.com>
parents:
105877
diff
changeset
|
1980 new list. LIST is a list as returned from text_property_list. |
85fd976607be
Fix bounds checking for text properties in `format' (Bug#5306).
Chong Yidong <cyd@stupidchicken.com>
parents:
105877
diff
changeset
|
1981 Discard properties that begin at or after NEW_END, and limit |
85fd976607be
Fix bounds checking for text properties in `format' (Bug#5306).
Chong Yidong <cyd@stupidchicken.com>
parents:
105877
diff
changeset
|
1982 end-points to NEW_END. */ |
25000 | 1983 |
106780
85fd976607be
Fix bounds checking for text properties in `format' (Bug#5306).
Chong Yidong <cyd@stupidchicken.com>
parents:
105877
diff
changeset
|
1984 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1985 extend_property_ranges (Lisp_Object list, Lisp_Object new_end) |
25000 | 1986 { |
106780
85fd976607be
Fix bounds checking for text properties in `format' (Bug#5306).
Chong Yidong <cyd@stupidchicken.com>
parents:
105877
diff
changeset
|
1987 Lisp_Object prev = Qnil, head = list; |
110564
08d10ad776d8
Fix int/EMACS_INT use in textprop.c and window.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109179
diff
changeset
|
1988 EMACS_INT max = XINT (new_end); |
106780
85fd976607be
Fix bounds checking for text properties in `format' (Bug#5306).
Chong Yidong <cyd@stupidchicken.com>
parents:
105877
diff
changeset
|
1989 |
85fd976607be
Fix bounds checking for text properties in `format' (Bug#5306).
Chong Yidong <cyd@stupidchicken.com>
parents:
105877
diff
changeset
|
1990 for (; CONSP (list); prev = list, list = XCDR (list)) |
25000 | 1991 { |
106780
85fd976607be
Fix bounds checking for text properties in `format' (Bug#5306).
Chong Yidong <cyd@stupidchicken.com>
parents:
105877
diff
changeset
|
1992 Lisp_Object item, beg, end; |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
1993 |
25000 | 1994 item = XCAR (list); |
106780
85fd976607be
Fix bounds checking for text properties in `format' (Bug#5306).
Chong Yidong <cyd@stupidchicken.com>
parents:
105877
diff
changeset
|
1995 beg = XCAR (item); |
25000 | 1996 end = XCAR (XCDR (item)); |
1997 | |
106780
85fd976607be
Fix bounds checking for text properties in `format' (Bug#5306).
Chong Yidong <cyd@stupidchicken.com>
parents:
105877
diff
changeset
|
1998 if (XINT (beg) >= max) |
85fd976607be
Fix bounds checking for text properties in `format' (Bug#5306).
Chong Yidong <cyd@stupidchicken.com>
parents:
105877
diff
changeset
|
1999 { |
85fd976607be
Fix bounds checking for text properties in `format' (Bug#5306).
Chong Yidong <cyd@stupidchicken.com>
parents:
105877
diff
changeset
|
2000 /* The start-point is past the end of the new string. |
85fd976607be
Fix bounds checking for text properties in `format' (Bug#5306).
Chong Yidong <cyd@stupidchicken.com>
parents:
105877
diff
changeset
|
2001 Discard this property. */ |
85fd976607be
Fix bounds checking for text properties in `format' (Bug#5306).
Chong Yidong <cyd@stupidchicken.com>
parents:
105877
diff
changeset
|
2002 if (EQ (head, list)) |
85fd976607be
Fix bounds checking for text properties in `format' (Bug#5306).
Chong Yidong <cyd@stupidchicken.com>
parents:
105877
diff
changeset
|
2003 head = XCDR (list); |
85fd976607be
Fix bounds checking for text properties in `format' (Bug#5306).
Chong Yidong <cyd@stupidchicken.com>
parents:
105877
diff
changeset
|
2004 else |
85fd976607be
Fix bounds checking for text properties in `format' (Bug#5306).
Chong Yidong <cyd@stupidchicken.com>
parents:
105877
diff
changeset
|
2005 XSETCDR (prev, XCDR (list)); |
85fd976607be
Fix bounds checking for text properties in `format' (Bug#5306).
Chong Yidong <cyd@stupidchicken.com>
parents:
105877
diff
changeset
|
2006 } |
85fd976607be
Fix bounds checking for text properties in `format' (Bug#5306).
Chong Yidong <cyd@stupidchicken.com>
parents:
105877
diff
changeset
|
2007 else if (XINT (end) > max) |
85fd976607be
Fix bounds checking for text properties in `format' (Bug#5306).
Chong Yidong <cyd@stupidchicken.com>
parents:
105877
diff
changeset
|
2008 /* The end-point is past the end of the new string. */ |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39527
diff
changeset
|
2009 XSETCAR (XCDR (item), new_end); |
25000 | 2010 } |
106780
85fd976607be
Fix bounds checking for text properties in `format' (Bug#5306).
Chong Yidong <cyd@stupidchicken.com>
parents:
105877
diff
changeset
|
2011 |
85fd976607be
Fix bounds checking for text properties in `format' (Bug#5306).
Chong Yidong <cyd@stupidchicken.com>
parents:
105877
diff
changeset
|
2012 return head; |
25000 | 2013 } |
2014 | |
2015 | |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2016 |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2017 /* Call the modification hook functions in LIST, each with START and END. */ |
4007
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
2018 |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2019 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2020 call_mod_hooks (Lisp_Object list, Lisp_Object start, Lisp_Object end) |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2021 { |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2022 struct gcpro gcpro1; |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2023 GCPRO1 (list); |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2024 while (!NILP (list)) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2025 { |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2026 call2 (Fcar (list), start, end); |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2027 list = Fcdr (list); |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2028 } |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2029 UNGCPRO; |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2030 } |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2031 |
20522
4409f95651d1
(Ftext_properties_at): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18736
diff
changeset
|
2032 /* Check for read-only intervals between character positions START ... END, |
4409f95651d1
(Ftext_properties_at): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18736
diff
changeset
|
2033 in BUF, and signal an error if we find one. |
4409f95651d1
(Ftext_properties_at): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18736
diff
changeset
|
2034 |
4409f95651d1
(Ftext_properties_at): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18736
diff
changeset
|
2035 Then check for any modification hooks in the range. |
4409f95651d1
(Ftext_properties_at): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18736
diff
changeset
|
2036 Create a list of all these hooks in lexicographic order, |
4409f95651d1
(Ftext_properties_at): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18736
diff
changeset
|
2037 eliminating consecutive extra copies of the same hook. Then call |
4409f95651d1
(Ftext_properties_at): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18736
diff
changeset
|
2038 those hooks in order, with START and END - 1 as arguments. */ |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2039 |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2040 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2041 verify_interval_modification (struct buffer *buf, int start, int end) |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2042 { |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2043 register INTERVAL intervals = BUF_INTERVALS (buf); |
25772
1902e7e63fa7
(Fset_text_properties): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents:
25645
diff
changeset
|
2044 register INTERVAL i; |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2045 Lisp_Object hooks; |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2046 register Lisp_Object prev_mod_hooks; |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2047 Lisp_Object mod_hooks; |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2048 struct gcpro gcpro1; |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2049 |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2050 hooks = Qnil; |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2051 prev_mod_hooks = Qnil; |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2052 mod_hooks = Qnil; |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2053 |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2054 interval_insert_behind_hooks = Qnil; |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2055 interval_insert_in_front_hooks = Qnil; |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2056 |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2057 if (NULL_INTERVAL_P (intervals)) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2058 return; |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2059 |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2060 if (start > end) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2061 { |
110564
08d10ad776d8
Fix int/EMACS_INT use in textprop.c and window.c.
Eli Zaretskii <eliz@gnu.org>
parents:
109179
diff
changeset
|
2062 EMACS_INT temp = start; |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2063 start = end; |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2064 end = temp; |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2065 } |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2066 |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2067 /* For an insert operation, check the two chars around the position. */ |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2068 if (start == end) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2069 { |
33952
ca22422634ac
(text_read_only): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
32849
diff
changeset
|
2070 INTERVAL prev = NULL; |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2071 Lisp_Object before, after; |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2072 |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2073 /* Set I to the interval containing the char after START, |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2074 and PREV to the interval containing the char before START. |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2075 Either one may be null. They may be equal. */ |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2076 i = find_interval (intervals, start); |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2077 |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2078 if (start == BUF_BEGV (buf)) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2079 prev = 0; |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2080 else if (i->position == start) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2081 prev = previous_interval (i); |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2082 else if (i->position < start) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2083 prev = i; |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2084 if (start == BUF_ZV (buf)) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2085 i = 0; |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2086 |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2087 /* If Vinhibit_read_only is set and is not a list, we can |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2088 skip the read_only checks. */ |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2089 if (NILP (Vinhibit_read_only) || CONSP (Vinhibit_read_only)) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2090 { |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2091 /* If I and PREV differ we need to check for the read-only |
17467
98c47e7857f3
Style of comments corrected.
Richard M. Stallman <rms@gnu.org>
parents:
16679
diff
changeset
|
2092 property together with its stickiness. If either I or |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2093 PREV are 0, this check is all we need. |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2094 We have to take special care, since read-only may be |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2095 indirectly defined via the category property. */ |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2096 if (i != prev) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2097 { |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2098 if (! NULL_INTERVAL_P (i)) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2099 { |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2100 after = textget (i->plist, Qread_only); |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
2101 |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2102 /* If interval I is read-only and read-only is |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2103 front-sticky, inhibit insertion. |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2104 Check for read-only as well as category. */ |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2105 if (! NILP (after) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2106 && NILP (Fmemq (after, Vinhibit_read_only))) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2107 { |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2108 Lisp_Object tem; |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2109 |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2110 tem = textget (i->plist, Qfront_sticky); |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2111 if (TMEM (Qread_only, tem) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2112 || (NILP (Fplist_get (i->plist, Qread_only)) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2113 && TMEM (Qcategory, tem))) |
48840
b6981c46191d
(text_read_only): New arg `propval'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46448
diff
changeset
|
2114 text_read_only (after); |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2115 } |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2116 } |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2117 |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2118 if (! NULL_INTERVAL_P (prev)) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2119 { |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2120 before = textget (prev->plist, Qread_only); |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
2121 |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2122 /* If interval PREV is read-only and read-only isn't |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2123 rear-nonsticky, inhibit insertion. |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2124 Check for read-only as well as category. */ |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2125 if (! NILP (before) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2126 && NILP (Fmemq (before, Vinhibit_read_only))) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2127 { |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2128 Lisp_Object tem; |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2129 |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2130 tem = textget (prev->plist, Qrear_nonsticky); |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2131 if (! TMEM (Qread_only, tem) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2132 && (! NILP (Fplist_get (prev->plist,Qread_only)) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2133 || ! TMEM (Qcategory, tem))) |
48840
b6981c46191d
(text_read_only): New arg `propval'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46448
diff
changeset
|
2134 text_read_only (before); |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2135 } |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2136 } |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2137 } |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2138 else if (! NULL_INTERVAL_P (i)) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2139 { |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2140 after = textget (i->plist, Qread_only); |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
2141 |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2142 /* If interval I is read-only and read-only is |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2143 front-sticky, inhibit insertion. |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2144 Check for read-only as well as category. */ |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2145 if (! NILP (after) && NILP (Fmemq (after, Vinhibit_read_only))) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2146 { |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2147 Lisp_Object tem; |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2148 |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2149 tem = textget (i->plist, Qfront_sticky); |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2150 if (TMEM (Qread_only, tem) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2151 || (NILP (Fplist_get (i->plist, Qread_only)) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2152 && TMEM (Qcategory, tem))) |
48840
b6981c46191d
(text_read_only): New arg `propval'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46448
diff
changeset
|
2153 text_read_only (after); |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2154 |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2155 tem = textget (prev->plist, Qrear_nonsticky); |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2156 if (! TMEM (Qread_only, tem) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2157 && (! NILP (Fplist_get (prev->plist, Qread_only)) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2158 || ! TMEM (Qcategory, tem))) |
48840
b6981c46191d
(text_read_only): New arg `propval'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46448
diff
changeset
|
2159 text_read_only (after); |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2160 } |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2161 } |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2162 } |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2163 |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2164 /* Run both insert hooks (just once if they're the same). */ |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2165 if (!NULL_INTERVAL_P (prev)) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2166 interval_insert_behind_hooks |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2167 = textget (prev->plist, Qinsert_behind_hooks); |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2168 if (!NULL_INTERVAL_P (i)) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2169 interval_insert_in_front_hooks |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2170 = textget (i->plist, Qinsert_in_front_hooks); |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2171 } |
39247
989367eb5ce1
(verify_interval_modification): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
39242
diff
changeset
|
2172 else |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2173 { |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2174 /* Loop over intervals on or next to START...END, |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2175 collecting their hooks. */ |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2176 |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2177 i = find_interval (intervals, start); |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2178 do |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2179 { |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2180 if (! INTERVAL_WRITABLE_P (i)) |
48840
b6981c46191d
(text_read_only): New arg `propval'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46448
diff
changeset
|
2181 text_read_only (textget (i->plist, Qread_only)); |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2182 |
39247
989367eb5ce1
(verify_interval_modification): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
39242
diff
changeset
|
2183 if (!inhibit_modification_hooks) |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2184 { |
39247
989367eb5ce1
(verify_interval_modification): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
39242
diff
changeset
|
2185 mod_hooks = textget (i->plist, Qmodification_hooks); |
989367eb5ce1
(verify_interval_modification): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
39242
diff
changeset
|
2186 if (! NILP (mod_hooks) && ! EQ (mod_hooks, prev_mod_hooks)) |
989367eb5ce1
(verify_interval_modification): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
39242
diff
changeset
|
2187 { |
989367eb5ce1
(verify_interval_modification): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
39242
diff
changeset
|
2188 hooks = Fcons (mod_hooks, hooks); |
989367eb5ce1
(verify_interval_modification): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
39242
diff
changeset
|
2189 prev_mod_hooks = mod_hooks; |
989367eb5ce1
(verify_interval_modification): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
39242
diff
changeset
|
2190 } |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2191 } |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2192 |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2193 i = next_interval (i); |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2194 } |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2195 /* Keep going thru the interval containing the char before END. */ |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2196 while (! NULL_INTERVAL_P (i) && i->position < end); |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2197 |
39247
989367eb5ce1
(verify_interval_modification): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
39242
diff
changeset
|
2198 if (!inhibit_modification_hooks) |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2199 { |
39247
989367eb5ce1
(verify_interval_modification): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
39242
diff
changeset
|
2200 GCPRO1 (hooks); |
989367eb5ce1
(verify_interval_modification): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
39242
diff
changeset
|
2201 hooks = Fnreverse (hooks); |
989367eb5ce1
(verify_interval_modification): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
39242
diff
changeset
|
2202 while (! EQ (hooks, Qnil)) |
989367eb5ce1
(verify_interval_modification): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
39242
diff
changeset
|
2203 { |
989367eb5ce1
(verify_interval_modification): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
39242
diff
changeset
|
2204 call_mod_hooks (Fcar (hooks), make_number (start), |
989367eb5ce1
(verify_interval_modification): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
39242
diff
changeset
|
2205 make_number (end)); |
989367eb5ce1
(verify_interval_modification): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
39242
diff
changeset
|
2206 hooks = Fcdr (hooks); |
989367eb5ce1
(verify_interval_modification): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
39242
diff
changeset
|
2207 } |
989367eb5ce1
(verify_interval_modification): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
39242
diff
changeset
|
2208 UNGCPRO; |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2209 } |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2210 } |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2211 } |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2212 |
20522
4409f95651d1
(Ftext_properties_at): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18736
diff
changeset
|
2213 /* Run the interval hooks for an insertion on character range START ... END. |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2214 verify_interval_modification chose which hooks to run; |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2215 this function is called after the insertion happens |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2216 so it can indicate the range of inserted text. */ |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2217 |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2218 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2219 report_interval_modification (Lisp_Object start, Lisp_Object end) |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2220 { |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2221 if (! NILP (interval_insert_behind_hooks)) |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
17467
diff
changeset
|
2222 call_mod_hooks (interval_insert_behind_hooks, start, end); |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2223 if (! NILP (interval_insert_in_front_hooks) |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2224 && ! EQ (interval_insert_in_front_hooks, |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2225 interval_insert_behind_hooks)) |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
17467
diff
changeset
|
2226 call_mod_hooks (interval_insert_in_front_hooks, start, end); |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2227 } |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2228 |
1029 | 2229 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2230 syms_of_textprop (void) |
1029 | 2231 { |
112364
42e22c4f06b7
Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents:
112278
diff
changeset
|
2232 DEFVAR_LISP ("default-text-properties", Vdefault_text_properties, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2233 doc: /* Property-list used as default values. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2234 The value of a property in this list is seen as the value for every |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2235 character that does not have its own value for that property. */); |
11131
5db8a01b22cb
(Vdefault_text_properties): name changed from Vdefault_properties.
Boris Goldowsky <boris@gnu.org>
parents:
11116
diff
changeset
|
2236 Vdefault_text_properties = Qnil; |
10925
0480d65be55d
(Vdefault_properties): New vbl.
Boris Goldowsky <boris@gnu.org>
parents:
10488
diff
changeset
|
2237 |
112364
42e22c4f06b7
Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents:
112278
diff
changeset
|
2238 DEFVAR_LISP ("char-property-alias-alist", Vchar_property_alias_alist, |
45680
c9e70e34b426
(Vchar_property_alias_alist): New variable.
Colin Walters <walters@gnu.org>
parents:
44976
diff
changeset
|
2239 doc: /* Alist of alternative properties for properties without a value. |
c9e70e34b426
(Vchar_property_alias_alist): New variable.
Colin Walters <walters@gnu.org>
parents:
44976
diff
changeset
|
2240 Each element should look like (PROPERTY ALTERNATIVE1 ALTERNATIVE2...). |
c9e70e34b426
(Vchar_property_alias_alist): New variable.
Colin Walters <walters@gnu.org>
parents:
44976
diff
changeset
|
2241 If a piece of text has no direct value for a particular property, then |
c9e70e34b426
(Vchar_property_alias_alist): New variable.
Colin Walters <walters@gnu.org>
parents:
44976
diff
changeset
|
2242 this alist is consulted. If that property appears in the alist, then |
c9e70e34b426
(Vchar_property_alias_alist): New variable.
Colin Walters <walters@gnu.org>
parents:
44976
diff
changeset
|
2243 the first non-nil value from the associated alternative properties is |
c9e70e34b426
(Vchar_property_alias_alist): New variable.
Colin Walters <walters@gnu.org>
parents:
44976
diff
changeset
|
2244 returned. */); |
c9e70e34b426
(Vchar_property_alias_alist): New variable.
Colin Walters <walters@gnu.org>
parents:
44976
diff
changeset
|
2245 Vchar_property_alias_alist = Qnil; |
c9e70e34b426
(Vchar_property_alias_alist): New variable.
Colin Walters <walters@gnu.org>
parents:
44976
diff
changeset
|
2246 |
112364
42e22c4f06b7
Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents:
112278
diff
changeset
|
2247 DEFVAR_LISP ("inhibit-point-motion-hooks", Vinhibit_point_motion_hooks, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2248 doc: /* If non-nil, don't run `point-left' and `point-entered' text properties. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2249 This also inhibits the use of the `intangible' text property. */); |
4242
49007dbbec4c
(syms_of_textprop): Set up Lisp var Vinhibit_point_motion_hooks.
Richard M. Stallman <rms@gnu.org>
parents:
4214
diff
changeset
|
2250 Vinhibit_point_motion_hooks = Qnil; |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2251 |
26872
ea588757e607
(Vtext_property_default_nonsticky): New variable
Kenichi Handa <handa@m17n.org>
parents:
26605
diff
changeset
|
2252 DEFVAR_LISP ("text-property-default-nonsticky", |
112364
42e22c4f06b7
Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents:
112278
diff
changeset
|
2253 Vtext_property_default_nonsticky, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2254 doc: /* Alist of properties vs the corresponding non-stickinesses. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2255 Each element has the form (PROPERTY . NONSTICKINESS). |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2256 |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2257 If a character in a buffer has PROPERTY, new text inserted adjacent to |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2258 the character doesn't inherit PROPERTY if NONSTICKINESS is non-nil, |
95453
ca950c418cdd
(syms_of_textprop) <text-property-default-nonsticky>:
Juanma Barranquero <lekktu@gmail.com>
parents:
94963
diff
changeset
|
2259 inherits it if NONSTICKINESS is nil. The `front-sticky' and |
ca950c418cdd
(syms_of_textprop) <text-property-default-nonsticky>:
Juanma Barranquero <lekktu@gmail.com>
parents:
94963
diff
changeset
|
2260 `rear-nonsticky' properties of the character override NONSTICKINESS. */); |
57477
c4f6faab46b0
(syms_of_textprop): Add `syntax-table' to the nonsticky props.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55652
diff
changeset
|
2261 /* Text property `syntax-table' should be nonsticky by default. */ |
c4f6faab46b0
(syms_of_textprop): Add `syntax-table' to the nonsticky props.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55652
diff
changeset
|
2262 Vtext_property_default_nonsticky |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2263 = Fcons (Fcons (intern_c_string ("syntax-table"), Qt), Qnil); |
26872
ea588757e607
(Vtext_property_default_nonsticky): New variable
Kenichi Handa <handa@m17n.org>
parents:
26605
diff
changeset
|
2264 |
13027
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2265 staticpro (&interval_insert_behind_hooks); |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2266 staticpro (&interval_insert_in_front_hooks); |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2267 interval_insert_behind_hooks = Qnil; |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2268 interval_insert_in_front_hooks = Qnil; |
48358e0fa98e
(call_mod_hooks): Moved from intevals.c
Richard M. Stallman <rms@gnu.org>
parents:
12641
diff
changeset
|
2269 |
49247
5856f0179746
(Ftext_properties_at, Fnext_char_property_change)
Francesco Potortì <pot@gnu.org>
parents:
48840
diff
changeset
|
2270 |
1029 | 2271 /* Common attributes one might give text */ |
2272 | |
2273 staticpro (&Qforeground); | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2274 Qforeground = intern_c_string ("foreground"); |
1029 | 2275 staticpro (&Qbackground); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2276 Qbackground = intern_c_string ("background"); |
1029 | 2277 staticpro (&Qfont); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2278 Qfont = intern_c_string ("font"); |
1029 | 2279 staticpro (&Qstipple); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2280 Qstipple = intern_c_string ("stipple"); |
1029 | 2281 staticpro (&Qunderline); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2282 Qunderline = intern_c_string ("underline"); |
1029 | 2283 staticpro (&Qread_only); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2284 Qread_only = intern_c_string ("read-only"); |
1029 | 2285 staticpro (&Qinvisible); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2286 Qinvisible = intern_c_string ("invisible"); |
6755
a2bccbc870e6
(syms_of_textprop): Initialize Qintangible.
Karl Heuer <kwzh@gnu.org>
parents:
6681
diff
changeset
|
2287 staticpro (&Qintangible); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2288 Qintangible = intern_c_string ("intangible"); |
2058
a43d0bb1b7d8
(Fget_text_property): Use textget.
Richard M. Stallman <rms@gnu.org>
parents:
2053
diff
changeset
|
2289 staticpro (&Qcategory); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2290 Qcategory = intern_c_string ("category"); |
2058
a43d0bb1b7d8
(Fget_text_property): Use textget.
Richard M. Stallman <rms@gnu.org>
parents:
2053
diff
changeset
|
2291 staticpro (&Qlocal_map); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2292 Qlocal_map = intern_c_string ("local-map"); |
4381
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
2293 staticpro (&Qfront_sticky); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2294 Qfront_sticky = intern_c_string ("front-sticky"); |
4381
b0556af4d680
(Qfront_sticky, Qrear_nonsticky): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
4242
diff
changeset
|
2295 staticpro (&Qrear_nonsticky); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2296 Qrear_nonsticky = intern_c_string ("rear-nonsticky"); |
23729
cf1cbb0e5d5b
(Qmouse_face): Variable definition moved here.
Richard M. Stallman <rms@gnu.org>
parents:
22344
diff
changeset
|
2297 staticpro (&Qmouse_face); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2298 Qmouse_face = intern_c_string ("mouse-face"); |
100688
8233f3e2beb4
* textprop.c (Qminibuffer_prompt): New variable.
Martin Rudalics <rudalics@gmx.at>
parents:
99343
diff
changeset
|
2299 staticpro (&Qminibuffer_prompt); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2300 Qminibuffer_prompt = intern_c_string ("minibuffer-prompt"); |
1029 | 2301 |
2302 /* Properties that text might use to specify certain actions */ | |
2303 | |
2304 staticpro (&Qmouse_left); | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2305 Qmouse_left = intern_c_string ("mouse-left"); |
1029 | 2306 staticpro (&Qmouse_entered); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2307 Qmouse_entered = intern_c_string ("mouse-entered"); |
1029 | 2308 staticpro (&Qpoint_left); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2309 Qpoint_left = intern_c_string ("point-left"); |
1029 | 2310 staticpro (&Qpoint_entered); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2311 Qpoint_entered = intern_c_string ("point-entered"); |
1029 | 2312 |
2313 defsubr (&Stext_properties_at); | |
1857
9d65dfc7bdb7
(Fadd_text_properties): Put OBJECT arg last. Make it optional.
Richard M. Stallman <rms@gnu.org>
parents:
1715
diff
changeset
|
2314 defsubr (&Sget_text_property); |
7582
454c279b6d18
(syms_of_textprop): Set up Lisp fn get-char-property.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
2315 defsubr (&Sget_char_property); |
53201
c90162ba57c6
(Fget_char_property_and_overlay): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
2316 defsubr (&Sget_char_property_and_overlay); |
16679
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
2317 defsubr (&Snext_char_property_change); |
38c158927e6f
(Fnext_char_property_change): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16339
diff
changeset
|
2318 defsubr (&Sprevious_char_property_change); |
30242
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
2319 defsubr (&Snext_single_char_property_change); |
6af73af0f1ef
(Fnext_single_char_property_change):
Miles Bader <miles@gnu.org>
parents:
29342
diff
changeset
|
2320 defsubr (&Sprevious_single_char_property_change); |
1029 | 2321 defsubr (&Snext_property_change); |
1211 | 2322 defsubr (&Snext_single_property_change); |
1029 | 2323 defsubr (&Sprevious_property_change); |
1211 | 2324 defsubr (&Sprevious_single_property_change); |
1029 | 2325 defsubr (&Sadd_text_properties); |
1965
2bdbd6ed2430
(Fadd_text_properties, Fremove_text_properties):
Richard M. Stallman <rms@gnu.org>
parents:
1930
diff
changeset
|
2326 defsubr (&Sput_text_property); |
1029 | 2327 defsubr (&Sset_text_properties); |
2328 defsubr (&Sremove_text_properties); | |
44673
01f74663f76e
(remove_properties): New arg LIST allows scanning
Richard M. Stallman <rms@gnu.org>
parents:
43896
diff
changeset
|
2329 defsubr (&Sremove_list_of_text_properties); |
4144
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
2330 defsubr (&Stext_property_any); |
8f5545cf9774
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4076
diff
changeset
|
2331 defsubr (&Stext_property_not_all); |
1857
9d65dfc7bdb7
(Fadd_text_properties): Put OBJECT arg last. Make it optional.
Richard M. Stallman <rms@gnu.org>
parents:
1715
diff
changeset
|
2332 /* defsubr (&Serase_text_properties); */ |
4007
55da23f04d01
* textprop.c (copy_text_properties): Pass a copy of POS to
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
2333 /* defsubr (&Scopy_text_properties); */ |
1029 | 2334 } |
52401 | 2335 |