Mercurial > emacs
annotate src/buffer.c @ 6063:233fffcfb6c8
(Fget_char_property): New function.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Thu, 24 Feb 1994 19:18:32 +0000 |
parents | e40292d5c167 |
children | 16fdee72722b |
rev | line source |
---|---|
333 | 1 /* Buffer manipulation primitives for GNU Emacs. |
5570
2c5f3537a1cc
(syms_of_buffer): Don't do (put 'erase-buffer 'disabled t) here.
Roland McGrath <roland@gnu.org>
parents:
5502
diff
changeset
|
2 Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994 |
1953
714df59790af
(Ferase_buffer): Added interactive spec.
Roland McGrath <roland@gnu.org>
parents:
1952
diff
changeset
|
3 Free Software Foundation, Inc. |
333 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
7 GNU Emacs is free software; you can redistribute it and/or modify | |
8 it under the terms of the GNU General Public License as published by | |
1953
714df59790af
(Ferase_buffer): Added interactive spec.
Roland McGrath <roland@gnu.org>
parents:
1952
diff
changeset
|
9 the Free Software Foundation; either version 2, or (at your option) |
333 | 10 any later version. |
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 | |
18 along with GNU Emacs; see the file COPYING. If not, write to | |
19 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | |
20 | |
21 | |
1563
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
22 #include <sys/types.h> |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
23 #include <sys/stat.h> |
333 | 24 #include <sys/param.h> |
25 | |
26 #ifndef MAXPATHLEN | |
27 /* in 4.1, param.h fails to define this. */ | |
28 #define MAXPATHLEN 1024 | |
29 #endif /* not MAXPATHLEN */ | |
30 | |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4574
diff
changeset
|
31 #include <config.h> |
333 | 32 #include "lisp.h" |
1308
2660a7053836
* buffer.c: #include intervals.h.
Joseph Arceneaux <jla@gnu.org>
parents:
1291
diff
changeset
|
33 #include "intervals.h" |
333 | 34 #include "window.h" |
35 #include "commands.h" | |
36 #include "buffer.h" | |
37 #include "indent.h" | |
2480 | 38 #include "blockinput.h" |
333 | 39 |
40 struct buffer *current_buffer; /* the current buffer */ | |
41 | |
42 /* First buffer in chain of all buffers (in reverse order of creation). | |
43 Threaded through ->next. */ | |
44 | |
45 struct buffer *all_buffers; | |
46 | |
47 /* This structure holds the default values of the buffer-local variables | |
48 defined with DEFVAR_PER_BUFFER, that have special slots in each buffer. | |
49 The default value occupies the same slot in this structure | |
50 as an individual buffer's value occupies in that buffer. | |
51 Setting the default value also goes through the alist of buffers | |
52 and stores into each buffer that does not say it has a local value. */ | |
53 | |
54 struct buffer buffer_defaults; | |
55 | |
56 /* A Lisp_Object pointer to the above, used for staticpro */ | |
57 | |
58 static Lisp_Object Vbuffer_defaults; | |
59 | |
60 /* This structure marks which slots in a buffer have corresponding | |
61 default values in buffer_defaults. | |
62 Each such slot has a nonzero value in this structure. | |
63 The value has only one nonzero bit. | |
64 | |
65 When a buffer has its own local value for a slot, | |
66 the bit for that slot (found in the same slot in this structure) | |
67 is turned on in the buffer's local_var_flags slot. | |
68 | |
69 If a slot in this structure is -1, then even though there may | |
70 be a DEFVAR_PER_BUFFER for the slot, there is no default value for it; | |
71 and the corresponding slot in buffer_defaults is not used. | |
72 | |
73 If a slot is -2, then there is no DEFVAR_PER_BUFFER for it, | |
74 but there is a default value which is copied into each buffer. | |
75 | |
76 If a slot in this structure is negative, then even though there may | |
77 be a DEFVAR_PER_BUFFER for the slot, there is no default value for it; | |
78 and the corresponding slot in buffer_defaults is not used. | |
79 | |
80 If a slot in this structure corresponding to a DEFVAR_PER_BUFFER is | |
81 zero, that is a bug */ | |
82 | |
83 struct buffer buffer_local_flags; | |
84 | |
85 /* This structure holds the names of symbols whose values may be | |
86 buffer-local. It is indexed and accessed in the same way as the above. */ | |
87 | |
88 struct buffer buffer_local_symbols; | |
89 /* A Lisp_Object pointer to the above, used for staticpro */ | |
90 static Lisp_Object Vbuffer_local_symbols; | |
91 | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
92 /* This structure holds the required types for the values in the |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
93 buffer-local slots. If a slot contains Qnil, then the |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
94 corresponding buffer slot may contain a value of any type. If a |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
95 slot contains an integer, then prospective values' tags must be |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
96 equal to that integer. When a tag does not match, the function |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
97 buffer_slot_type_mismatch will signal an error. */ |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
98 struct buffer buffer_local_types; |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
99 |
333 | 100 Lisp_Object Fset_buffer (); |
392 | 101 void set_buffer_internal (); |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
102 static void call_overlay_mod_hooks (); |
333 | 103 |
104 /* Alist of all buffer names vs the buffers. */ | |
105 /* This used to be a variable, but is no longer, | |
106 to prevent lossage due to user rplac'ing this alist or its elements. */ | |
107 Lisp_Object Vbuffer_alist; | |
108 | |
109 /* Functions to call before and after each text change. */ | |
110 Lisp_Object Vbefore_change_function; | |
111 Lisp_Object Vafter_change_function; | |
112 | |
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
113 Lisp_Object Vtransient_mark_mode; |
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
114 |
3481
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
115 /* t means ignore all read-only text properties. |
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
116 A list means ignore such a property if its value is a member of the list. |
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
117 Any non-nil value means ignore buffer-read-only. */ |
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
118 Lisp_Object Vinhibit_read_only; |
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
119 |
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
120 /* List of functions to call that can query about killing a buffer. |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
121 If any of these functions returns nil, we don't kill it. */ |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
122 Lisp_Object Vkill_buffer_query_functions; |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
123 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
124 /* List of functions to call before changing an unmodified buffer. */ |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
125 Lisp_Object Vfirst_change_hook; |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
126 Lisp_Object Qfirst_change_hook; |
333 | 127 |
128 Lisp_Object Qfundamental_mode, Qmode_class, Qpermanent_local; | |
129 | |
130 Lisp_Object Qprotected_field; | |
131 | |
132 Lisp_Object QSFundamental; /* A string "Fundamental" */ | |
133 | |
134 Lisp_Object Qkill_buffer_hook; | |
135 | |
5433 | 136 Lisp_Object Qget_file_buffer; |
137 | |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
138 Lisp_Object Qoverlayp; |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
139 |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
140 Lisp_Object Qpriority, Qwindow; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
141 |
4213
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
142 Lisp_Object Qmodification_hooks; |
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
143 Lisp_Object Qinsert_in_front_hooks; |
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
144 Lisp_Object Qinsert_behind_hooks; |
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
145 |
333 | 146 /* For debugging; temporary. See set_buffer_internal. */ |
147 /* Lisp_Object Qlisp_mode, Vcheck_symbol; */ | |
148 | |
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
149 #ifdef MSDOS |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
150 Lisp_Object Qbuffer_file_type; |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
151 #endif |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
152 |
333 | 153 nsberror (spec) |
154 Lisp_Object spec; | |
155 { | |
156 if (XTYPE (spec) == Lisp_String) | |
157 error ("No buffer named %s", XSTRING (spec)->data); | |
158 error ("Invalid buffer argument"); | |
159 } | |
160 | |
161 DEFUN ("buffer-list", Fbuffer_list, Sbuffer_list, 0, 0, 0, | |
162 "Return a list of all existing live buffers.") | |
163 () | |
164 { | |
165 return Fmapcar (Qcdr, Vbuffer_alist); | |
166 } | |
167 | |
168 DEFUN ("get-buffer", Fget_buffer, Sget_buffer, 1, 1, 0, | |
169 "Return the buffer named NAME (a string).\n\ | |
170 If there is no live buffer named NAME, return nil.\n\ | |
171 NAME may also be a buffer; if so, the value is that buffer.") | |
172 (name) | |
173 register Lisp_Object name; | |
174 { | |
175 if (XTYPE (name) == Lisp_Buffer) | |
176 return name; | |
177 CHECK_STRING (name, 0); | |
178 | |
179 return Fcdr (Fassoc (name, Vbuffer_alist)); | |
180 } | |
181 | |
182 DEFUN ("get-file-buffer", Fget_file_buffer, Sget_file_buffer, 1, 1, 0, | |
183 "Return the buffer visiting file FILENAME (a string).\n\ | |
184 If there is no such live buffer, return nil.") | |
185 (filename) | |
186 register Lisp_Object filename; | |
187 { | |
188 register Lisp_Object tail, buf, tem; | |
5433 | 189 Lisp_Object handler; |
190 | |
333 | 191 CHECK_STRING (filename, 0); |
192 filename = Fexpand_file_name (filename, Qnil); | |
193 | |
5433 | 194 /* If the file name has special constructs in it, |
195 call the corresponding file handler. */ | |
196 handler = Ffind_file_name_handler (filename); | |
197 if (!NILP (handler)) | |
198 return call2 (handler, Qget_file_buffer, filename); | |
199 | |
333 | 200 for (tail = Vbuffer_alist; CONSP (tail); tail = XCONS (tail)->cdr) |
201 { | |
202 buf = Fcdr (XCONS (tail)->car); | |
203 if (XTYPE (buf) != Lisp_Buffer) continue; | |
204 if (XTYPE (XBUFFER (buf)->filename) != Lisp_String) continue; | |
205 tem = Fstring_equal (XBUFFER (buf)->filename, filename); | |
485 | 206 if (!NILP (tem)) |
333 | 207 return buf; |
208 } | |
209 return Qnil; | |
210 } | |
211 | |
212 /* Incremented for each buffer created, to assign the buffer number. */ | |
213 int buffer_count; | |
214 | |
215 DEFUN ("get-buffer-create", Fget_buffer_create, Sget_buffer_create, 1, 1, 0, | |
216 "Return the buffer named NAME, or create such a buffer and return it.\n\ | |
217 A new buffer is created if there is no live buffer named NAME.\n\ | |
1195
beefc235076e
* buffer.c (Fget_buffer_create): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1041
diff
changeset
|
218 If NAME starts with a space, the new buffer does not keep undo information.\n\ |
333 | 219 If NAME is a buffer instead of a string, then it is the value returned.\n\ |
220 The value is never nil.") | |
221 (name) | |
222 register Lisp_Object name; | |
223 { | |
224 register Lisp_Object buf, function, tem; | |
225 int count = specpdl_ptr - specpdl; | |
226 register struct buffer *b; | |
227 | |
228 buf = Fget_buffer (name); | |
485 | 229 if (!NILP (buf)) |
333 | 230 return buf; |
231 | |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
232 b = (struct buffer *) xmalloc (sizeof (struct buffer)); |
333 | 233 |
234 BUF_GAP_SIZE (b) = 20; | |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
235 BLOCK_INPUT; |
333 | 236 BUFFER_ALLOC (BUF_BEG_ADDR (b), BUF_GAP_SIZE (b)); |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
237 UNBLOCK_INPUT; |
333 | 238 if (! BUF_BEG_ADDR (b)) |
239 memory_full (); | |
240 | |
241 BUF_PT (b) = 1; | |
242 BUF_GPT (b) = 1; | |
243 BUF_BEGV (b) = 1; | |
244 BUF_ZV (b) = 1; | |
245 BUF_Z (b) = 1; | |
246 BUF_MODIFF (b) = 1; | |
247 | |
248 /* Put this on the chain of all buffers including killed ones. */ | |
249 b->next = all_buffers; | |
250 all_buffers = b; | |
251 | |
252 b->mark = Fmake_marker (); | |
253 /*b->number = make_number (++buffer_count);*/ | |
254 b->name = name; | |
255 if (XSTRING (name)->data[0] != ' ') | |
256 b->undo_list = Qnil; | |
257 else | |
258 b->undo_list = Qt; | |
259 | |
260 reset_buffer (b); | |
261 | |
262 /* Put this in the alist of all live buffers. */ | |
263 XSET (buf, Lisp_Buffer, b); | |
264 Vbuffer_alist = nconc2 (Vbuffer_alist, Fcons (Fcons (name, buf), Qnil)); | |
265 | |
266 b->mark = Fmake_marker (); | |
267 b->markers = Qnil; | |
268 b->name = name; | |
269 | |
270 function = buffer_defaults.major_mode; | |
485 | 271 if (NILP (function)) |
333 | 272 { |
273 tem = Fget (current_buffer->major_mode, Qmode_class); | |
274 if (EQ (tem, Qnil)) | |
275 function = current_buffer->major_mode; | |
276 } | |
277 | |
485 | 278 if (NILP (function) || EQ (function, Qfundamental_mode)) |
333 | 279 return buf; |
280 | |
281 /* To select a nonfundamental mode, | |
282 select the buffer temporarily and then call the mode function. */ | |
283 | |
284 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
285 | |
286 Fset_buffer (buf); | |
287 call0 (function); | |
288 | |
289 return unbind_to (count, buf); | |
290 } | |
291 | |
292 /* Reinitialize everything about a buffer except its name and contents. */ | |
293 | |
294 void | |
295 reset_buffer (b) | |
296 register struct buffer *b; | |
297 { | |
298 b->filename = Qnil; | |
299 b->directory = (current_buffer) ? current_buffer->directory : Qnil; | |
300 b->modtime = 0; | |
301 b->save_modified = 1; | |
1501
c090f7dcfd27
* buffer.c (reset_buffer): Don't assign to b->save_length as if it
Jim Blandy <jimb@redhat.com>
parents:
1348
diff
changeset
|
302 XFASTINT (b->save_length) = 0; |
333 | 303 b->last_window_start = 1; |
304 b->backed_up = Qnil; | |
305 b->auto_save_modified = 0; | |
306 b->auto_save_file_name = Qnil; | |
307 b->read_only = Qnil; | |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
308 b->overlays_before = Qnil; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
309 b->overlays_after = Qnil; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
310 XFASTINT (b->overlay_center) = 1; |
3242
f873e6b9af52
(reset_buffer): Clear mark_active field here.
Richard M. Stallman <rms@gnu.org>
parents:
3226
diff
changeset
|
311 b->mark_active = Qnil; |
1291
7c32612174c3
* buffer.c (reset_buffer): Do INITIALIZE_INTERVAL on the buffer's
Joseph Arceneaux <jla@gnu.org>
parents:
1281
diff
changeset
|
312 |
7c32612174c3
* buffer.c (reset_buffer): Do INITIALIZE_INTERVAL on the buffer's
Joseph Arceneaux <jla@gnu.org>
parents:
1281
diff
changeset
|
313 /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */ |
7c32612174c3
* buffer.c (reset_buffer): Do INITIALIZE_INTERVAL on the buffer's
Joseph Arceneaux <jla@gnu.org>
parents:
1281
diff
changeset
|
314 INITIALIZE_INTERVAL (b, NULL_INTERVAL); |
7c32612174c3
* buffer.c (reset_buffer): Do INITIALIZE_INTERVAL on the buffer's
Joseph Arceneaux <jla@gnu.org>
parents:
1281
diff
changeset
|
315 |
333 | 316 reset_buffer_local_variables(b); |
317 } | |
318 | |
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
319 reset_buffer_local_variables (b) |
333 | 320 register struct buffer *b; |
321 { | |
322 register int offset; | |
323 | |
324 /* Reset the major mode to Fundamental, together with all the | |
325 things that depend on the major mode. | |
326 default-major-mode is handled at a higher level. | |
327 We ignore it here. */ | |
328 b->major_mode = Qfundamental_mode; | |
329 b->keymap = Qnil; | |
330 b->abbrev_table = Vfundamental_mode_abbrev_table; | |
331 b->mode_name = QSFundamental; | |
332 b->minor_modes = Qnil; | |
333 b->downcase_table = Vascii_downcase_table; | |
334 b->upcase_table = Vascii_upcase_table; | |
335 b->case_canon_table = Vascii_downcase_table; | |
336 b->case_eqv_table = Vascii_upcase_table; | |
337 #if 0 | |
338 b->sort_table = XSTRING (Vascii_sort_table); | |
339 b->folding_sort_table = XSTRING (Vascii_folding_sort_table); | |
340 #endif /* 0 */ | |
341 | |
342 /* Reset all per-buffer variables to their defaults. */ | |
343 b->local_var_alist = Qnil; | |
344 b->local_var_flags = 0; | |
345 | |
346 /* For each slot that has a default value, | |
347 copy that into the slot. */ | |
348 | |
349 for (offset = (char *)&buffer_local_flags.name - (char *)&buffer_local_flags; | |
350 offset < sizeof (struct buffer); | |
351 offset += sizeof (Lisp_Object)) /* sizeof int == sizeof Lisp_Object */ | |
352 if (*(int *)(offset + (char *) &buffer_local_flags) > 0 | |
353 || *(int *)(offset + (char *) &buffer_local_flags) == -2) | |
354 *(Lisp_Object *)(offset + (char *)b) = | |
355 *(Lisp_Object *)(offset + (char *)&buffer_defaults); | |
356 } | |
357 | |
392 | 358 /* We split this away from generate-new-buffer, because rename-buffer |
359 and set-visited-file-name ought to be able to use this to really | |
360 rename the buffer properly. */ | |
361 | |
362 DEFUN ("generate-new-buffer-name", Fgenerate_new_buffer_name, Sgenerate_new_buffer_name, | |
3226
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
363 1, 2, 0, |
392 | 364 "Return a string that is the name of no existing buffer based on NAME.\n\ |
365 If there is no live buffer named NAME, then return NAME.\n\ | |
333 | 366 Otherwise modify name by appending `<NUMBER>', incrementing NUMBER\n\ |
3226
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
367 until an unused name is found, and then return that name.\n\ |
3329
c9443f73d329
(Fgenerate_new_buffer_name): Doc fix.
Roland McGrath <roland@gnu.org>
parents:
3295
diff
changeset
|
368 Optional second argument IGNORE specifies a name that is okay to use\n\ |
3226
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
369 \(if it is in the sequence to be tried)\n\ |
3295
4d405f172c79
(reset_buffer): Clear mark_active field here.
Richard M. Stallman <rms@gnu.org>
parents:
3242
diff
changeset
|
370 even if a buffer with that name exists.") |
3226
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
371 (name, ignore) |
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
372 register Lisp_Object name, ignore; |
333 | 373 { |
374 register Lisp_Object gentemp, tem; | |
375 int count; | |
376 char number[10]; | |
377 | |
378 CHECK_STRING (name, 0); | |
379 | |
380 tem = Fget_buffer (name); | |
485 | 381 if (NILP (tem)) |
392 | 382 return name; |
333 | 383 |
384 count = 1; | |
385 while (1) | |
386 { | |
387 sprintf (number, "<%d>", ++count); | |
388 gentemp = concat2 (name, build_string (number)); | |
3665
0cffa82ec7de
(Fgenerate_new_buffer_name): GENTEMP is the value compare against IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
389 tem = Fstring_equal (gentemp, ignore); |
3226
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
390 if (!NILP (tem)) |
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
391 return gentemp; |
333 | 392 tem = Fget_buffer (gentemp); |
485 | 393 if (NILP (tem)) |
392 | 394 return gentemp; |
333 | 395 } |
396 } | |
397 | |
398 | |
399 DEFUN ("buffer-name", Fbuffer_name, Sbuffer_name, 0, 1, 0, | |
400 "Return the name of BUFFER, as a string.\n\ | |
392 | 401 With no argument or nil as argument, return the name of the current buffer.") |
333 | 402 (buffer) |
403 register Lisp_Object buffer; | |
404 { | |
485 | 405 if (NILP (buffer)) |
333 | 406 return current_buffer->name; |
407 CHECK_BUFFER (buffer, 0); | |
408 return XBUFFER (buffer)->name; | |
409 } | |
410 | |
411 DEFUN ("buffer-file-name", Fbuffer_file_name, Sbuffer_file_name, 0, 1, 0, | |
412 "Return name of file BUFFER is visiting, or nil if none.\n\ | |
413 No argument or nil as argument means use the current buffer.") | |
414 (buffer) | |
415 register Lisp_Object buffer; | |
416 { | |
485 | 417 if (NILP (buffer)) |
333 | 418 return current_buffer->filename; |
419 CHECK_BUFFER (buffer, 0); | |
420 return XBUFFER (buffer)->filename; | |
421 } | |
422 | |
423 DEFUN ("buffer-local-variables", Fbuffer_local_variables, | |
424 Sbuffer_local_variables, 0, 1, 0, | |
425 "Return an alist of variables that are buffer-local in BUFFER.\n\ | |
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
426 Most elements look like (SYMBOL . VALUE), describing one variable.\n\ |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
427 For a symbol that is locally unbound, just the symbol appears in the value.\n\ |
333 | 428 Note that storing new VALUEs in these elements doesn't change the variables.\n\ |
429 No argument or nil as argument means use current buffer as BUFFER.") | |
430 (buffer) | |
431 register Lisp_Object buffer; | |
432 { | |
433 register struct buffer *buf; | |
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
434 register Lisp_Object result; |
333 | 435 |
485 | 436 if (NILP (buffer)) |
333 | 437 buf = current_buffer; |
438 else | |
439 { | |
440 CHECK_BUFFER (buffer, 0); | |
441 buf = XBUFFER (buffer); | |
442 } | |
443 | |
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
444 result = Qnil; |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
445 |
333 | 446 { |
447 /* Reference each variable in the alist in our current buffer. | |
448 If inquiring about the current buffer, this gets the current values, | |
449 so store them into the alist so the alist is up to date. | |
450 If inquiring about some other buffer, this swaps out any values | |
451 for that buffer, making the alist up to date automatically. */ | |
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
452 register Lisp_Object tail; |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
453 for (tail = buf->local_var_alist; CONSP (tail); tail = XCONS (tail)->cdr) |
333 | 454 { |
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
455 Lisp_Object val, elt; |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
456 |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
457 elt = XCONS (tail)->car; |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
458 |
333 | 459 if (buf == current_buffer) |
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
460 val = find_symbol_value (XCONS (elt)->car); |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
461 else |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
462 val = XCONS (elt)->cdr; |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
463 |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
464 /* If symbol is unbound, put just the symbol in the list. */ |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
465 if (EQ (val, Qunbound)) |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
466 result = Fcons (XCONS (elt)->car, result); |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
467 /* Otherwise, put (symbol . value) in the list. */ |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
468 else |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
469 result = Fcons (Fcons (XCONS (elt)->car, val), result); |
333 | 470 } |
471 } | |
472 | |
473 /* Add on all the variables stored in special slots. */ | |
474 { | |
475 register int offset, mask; | |
476 | |
477 for (offset = (char *)&buffer_local_symbols.name - (char *)&buffer_local_symbols; | |
478 offset < sizeof (struct buffer); | |
479 offset += (sizeof (int))) /* sizeof int == sizeof Lisp_Object */ | |
480 { | |
481 mask = *(int *)(offset + (char *) &buffer_local_flags); | |
482 if (mask == -1 || (buf->local_var_flags & mask)) | |
483 if (XTYPE (*(Lisp_Object *)(offset + (char *)&buffer_local_symbols)) | |
484 == Lisp_Symbol) | |
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
485 result = Fcons (Fcons (*(Lisp_Object *)(offset + (char *)&buffer_local_symbols), |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
486 *(Lisp_Object *)(offset + (char *)buf)), |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
487 result); |
333 | 488 } |
489 } | |
4100
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
490 |
f8c6e5e9603f
(Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents:
4077
diff
changeset
|
491 return result; |
333 | 492 } |
493 | |
494 | |
495 DEFUN ("buffer-modified-p", Fbuffer_modified_p, Sbuffer_modified_p, | |
496 0, 1, 0, | |
497 "Return t if BUFFER was modified since its file was last read or saved.\n\ | |
498 No argument or nil as argument means use current buffer as BUFFER.") | |
499 (buffer) | |
500 register Lisp_Object buffer; | |
501 { | |
502 register struct buffer *buf; | |
485 | 503 if (NILP (buffer)) |
333 | 504 buf = current_buffer; |
505 else | |
506 { | |
507 CHECK_BUFFER (buffer, 0); | |
508 buf = XBUFFER (buffer); | |
509 } | |
510 | |
511 return buf->save_modified < BUF_MODIFF (buf) ? Qt : Qnil; | |
512 } | |
513 | |
514 DEFUN ("set-buffer-modified-p", Fset_buffer_modified_p, Sset_buffer_modified_p, | |
515 1, 1, 0, | |
516 "Mark current buffer as modified or unmodified according to FLAG.\n\ | |
517 A non-nil FLAG means mark the buffer modified.") | |
518 (flag) | |
519 register Lisp_Object flag; | |
520 { | |
521 register int already; | |
522 register Lisp_Object fn; | |
523 | |
524 #ifdef CLASH_DETECTION | |
525 /* If buffer becoming modified, lock the file. | |
526 If buffer becoming unmodified, unlock the file. */ | |
527 | |
528 fn = current_buffer->filename; | |
485 | 529 if (!NILP (fn)) |
333 | 530 { |
531 already = current_buffer->save_modified < MODIFF; | |
485 | 532 if (!already && !NILP (flag)) |
333 | 533 lock_file (fn); |
485 | 534 else if (already && NILP (flag)) |
333 | 535 unlock_file (fn); |
536 } | |
537 #endif /* CLASH_DETECTION */ | |
538 | |
485 | 539 current_buffer->save_modified = NILP (flag) ? MODIFF : 0; |
333 | 540 update_mode_lines++; |
541 return flag; | |
542 } | |
543 | |
544 DEFUN ("buffer-modified-tick", Fbuffer_modified_tick, Sbuffer_modified_tick, | |
545 0, 1, 0, | |
546 "Return BUFFER's tick counter, incremented for each change in text.\n\ | |
547 Each buffer has a tick counter which is incremented each time the text in\n\ | |
548 that buffer is changed. It wraps around occasionally.\n\ | |
549 No argument or nil as argument means use current buffer as BUFFER.") | |
550 (buffer) | |
551 register Lisp_Object buffer; | |
552 { | |
553 register struct buffer *buf; | |
485 | 554 if (NILP (buffer)) |
333 | 555 buf = current_buffer; |
556 else | |
557 { | |
558 CHECK_BUFFER (buffer, 0); | |
559 buf = XBUFFER (buffer); | |
560 } | |
561 | |
562 return make_number (BUF_MODIFF (buf)); | |
563 } | |
564 | |
392 | 565 DEFUN ("rename-buffer", Frename_buffer, Srename_buffer, 1, 2, |
5074
bbc2accd226a
Undo last change. SPC feeping at you is too annoying.
Roland McGrath <roland@gnu.org>
parents:
5073
diff
changeset
|
566 "sRename buffer (to new name): \nP", |
333 | 567 "Change current buffer's name to NEWNAME (a string).\n\ |
1876
0ddafa88e654
(Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
568 If second arg UNIQUE is nil or omitted, it is an error if a\n\ |
392 | 569 buffer named NEWNAME already exists.\n\ |
1876
0ddafa88e654
(Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
570 If UNIQUE is non-nil, come up with a new name using\n\ |
392 | 571 `generate-new-buffer-name'.\n\ |
1876
0ddafa88e654
(Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
572 Interactively, you can set UNIQUE with a prefix argument.\n\ |
0ddafa88e654
(Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
573 We return the name we actually gave the buffer.\n\ |
333 | 574 This does not change the name of the visited file (if any).") |
1876
0ddafa88e654
(Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
575 (name, unique) |
0ddafa88e654
(Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
576 register Lisp_Object name, unique; |
333 | 577 { |
578 register Lisp_Object tem, buf; | |
579 | |
580 CHECK_STRING (name, 0); | |
581 tem = Fget_buffer (name); | |
5075
8deb7113bbdf
(Frename_buffer): When the current buffer is already named NAME, don't
Roland McGrath <roland@gnu.org>
parents:
5074
diff
changeset
|
582 /* Don't short-circuit if UNIQUE is t. That is a useful way to rename |
8deb7113bbdf
(Frename_buffer): When the current buffer is already named NAME, don't
Roland McGrath <roland@gnu.org>
parents:
5074
diff
changeset
|
583 the buffer automatically so you can create another with the original name. |
8deb7113bbdf
(Frename_buffer): When the current buffer is already named NAME, don't
Roland McGrath <roland@gnu.org>
parents:
5074
diff
changeset
|
584 It makes UNIQUE equivalent to |
8deb7113bbdf
(Frename_buffer): When the current buffer is already named NAME, don't
Roland McGrath <roland@gnu.org>
parents:
5074
diff
changeset
|
585 (rename-buffer (generate-new-buffer-name NAME)). */ |
8deb7113bbdf
(Frename_buffer): When the current buffer is already named NAME, don't
Roland McGrath <roland@gnu.org>
parents:
5074
diff
changeset
|
586 if (NILP (unique) && XBUFFER (tem) == current_buffer) |
392 | 587 return current_buffer->name; |
485 | 588 if (!NILP (tem)) |
392 | 589 { |
1876
0ddafa88e654
(Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
590 if (!NILP (unique)) |
3226
bc4beddaf2c7
(Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents:
3204
diff
changeset
|
591 name = Fgenerate_new_buffer_name (name, current_buffer->name); |
392 | 592 else |
593 error ("Buffer name \"%s\" is in use", XSTRING (name)->data); | |
594 } | |
333 | 595 |
596 current_buffer->name = name; | |
1707
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
597 |
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
598 /* Catch redisplay's attention. Unless we do this, the mode lines for |
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
599 any windows displaying current_buffer will stay unchanged. */ |
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
600 update_mode_lines++; |
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
601 |
333 | 602 XSET (buf, Lisp_Buffer, current_buffer); |
603 Fsetcar (Frassq (buf, Vbuffer_alist), name); | |
485 | 604 if (NILP (current_buffer->filename) && !NILP (current_buffer->auto_save_file_name)) |
333 | 605 call0 (intern ("rename-auto-save-file")); |
392 | 606 return name; |
333 | 607 } |
608 | |
1281
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
609 DEFUN ("other-buffer", Fother_buffer, Sother_buffer, 0, 2, 0, |
333 | 610 "Return most recently selected buffer other than BUFFER.\n\ |
1281
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
611 Buffers not visible in windows are preferred to visible buffers,\n\ |
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
612 unless optional second argument VISIBLE-OK is non-nil.\n\ |
333 | 613 If no other buffer exists, the buffer `*scratch*' is returned.\n\ |
614 If BUFFER is omitted or nil, some interesting buffer is returned.") | |
1281
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
615 (buffer, visible_ok) |
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
616 register Lisp_Object buffer, visible_ok; |
333 | 617 { |
618 register Lisp_Object tail, buf, notsogood, tem; | |
619 notsogood = Qnil; | |
620 | |
485 | 621 for (tail = Vbuffer_alist; !NILP (tail); tail = Fcdr (tail)) |
333 | 622 { |
623 buf = Fcdr (Fcar (tail)); | |
624 if (EQ (buf, buffer)) | |
625 continue; | |
626 if (XSTRING (XBUFFER (buf)->name)->data[0] == ' ') | |
627 continue; | |
1281
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
628 if (NILP (visible_ok)) |
3802
594bc11c67ba
Don't let the 'B' interactive spec default to buffers viewed in
Jim Blandy <jimb@redhat.com>
parents:
3785
diff
changeset
|
629 tem = Fget_buffer_window (buf, Qt); |
1281
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
630 else |
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
631 tem = Qnil; |
485 | 632 if (NILP (tem)) |
333 | 633 return buf; |
485 | 634 if (NILP (notsogood)) |
333 | 635 notsogood = buf; |
636 } | |
485 | 637 if (!NILP (notsogood)) |
333 | 638 return notsogood; |
639 return Fget_buffer_create (build_string ("*scratch*")); | |
640 } | |
641 | |
5247
0cf95629f6c4
(Fbuffer_disable_undo): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents:
5075
diff
changeset
|
642 DEFUN ("buffer-disable-undo", Fbuffer_disable_undo, Sbuffer_disable_undo, 0, 1, |
333 | 643 0, |
5247
0cf95629f6c4
(Fbuffer_disable_undo): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents:
5075
diff
changeset
|
644 "Make BUFFER stop keeping undo information.\n\ |
0cf95629f6c4
(Fbuffer_disable_undo): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents:
5075
diff
changeset
|
645 No argument or nil as argument means do this for the current buffer.") |
648 | 646 (buffer) |
647 register Lisp_Object buffer; | |
333 | 648 { |
648 | 649 Lisp_Object real_buffer; |
650 | |
651 if (NILP (buffer)) | |
652 XSET (real_buffer, Lisp_Buffer, current_buffer); | |
653 else | |
654 { | |
655 real_buffer = Fget_buffer (buffer); | |
656 if (NILP (real_buffer)) | |
657 nsberror (buffer); | |
658 } | |
659 | |
660 XBUFFER (real_buffer)->undo_list = Qt; | |
661 | |
333 | 662 return Qnil; |
663 } | |
664 | |
665 DEFUN ("buffer-enable-undo", Fbuffer_enable_undo, Sbuffer_enable_undo, | |
666 0, 1, "", | |
667 "Start keeping undo information for buffer BUFFER.\n\ | |
668 No argument or nil as argument means do this for the current buffer.") | |
648 | 669 (buffer) |
670 register Lisp_Object buffer; | |
333 | 671 { |
648 | 672 Lisp_Object real_buffer; |
333 | 673 |
648 | 674 if (NILP (buffer)) |
675 XSET (real_buffer, Lisp_Buffer, current_buffer); | |
333 | 676 else |
677 { | |
648 | 678 real_buffer = Fget_buffer (buffer); |
679 if (NILP (real_buffer)) | |
680 nsberror (buffer); | |
333 | 681 } |
682 | |
648 | 683 if (EQ (XBUFFER (real_buffer)->undo_list, Qt)) |
684 XBUFFER (real_buffer)->undo_list = Qnil; | |
333 | 685 |
686 return Qnil; | |
687 } | |
688 | |
689 /* | |
690 DEFVAR_LISP ("kill-buffer-hook", no_cell, "\ | |
691 Hook to be run (by `run-hooks', which see) when a buffer is killed.\n\ | |
692 The buffer being killed will be current while the hook is running.\n\ | |
693 See `kill-buffer'." | |
694 */ | |
695 DEFUN ("kill-buffer", Fkill_buffer, Skill_buffer, 1, 1, "bKill buffer: ", | |
696 "Kill the buffer BUFFER.\n\ | |
697 The argument may be a buffer or may be the name of a buffer.\n\ | |
698 An argument of nil means kill the current buffer.\n\n\ | |
699 Value is t if the buffer is actually killed, nil if user says no.\n\n\ | |
700 The value of `kill-buffer-hook' (which may be local to that buffer),\n\ | |
701 if not void, is a list of functions to be called, with no arguments,\n\ | |
702 before the buffer is actually killed. The buffer to be killed is current\n\ | |
703 when the hook functions are called.\n\n\ | |
704 Any processes that have this buffer as the `process-buffer' are killed\n\ | |
705 with `delete-process'.") | |
706 (bufname) | |
707 Lisp_Object bufname; | |
708 { | |
709 Lisp_Object buf; | |
710 register struct buffer *b; | |
711 register Lisp_Object tem; | |
712 register struct Lisp_Marker *m; | |
713 struct gcpro gcpro1, gcpro2; | |
714 | |
485 | 715 if (NILP (bufname)) |
333 | 716 buf = Fcurrent_buffer (); |
717 else | |
718 buf = Fget_buffer (bufname); | |
485 | 719 if (NILP (buf)) |
333 | 720 nsberror (bufname); |
721 | |
722 b = XBUFFER (buf); | |
723 | |
724 /* Query if the buffer is still modified. */ | |
485 | 725 if (INTERACTIVE && !NILP (b->filename) |
333 | 726 && BUF_MODIFF (b) > b->save_modified) |
727 { | |
728 GCPRO2 (buf, bufname); | |
729 tem = do_yes_or_no_p (format1 ("Buffer %s modified; kill anyway? ", | |
730 XSTRING (b->name)->data)); | |
731 UNGCPRO; | |
485 | 732 if (NILP (tem)) |
333 | 733 return Qnil; |
734 } | |
735 | |
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
736 /* Run hooks with the buffer to be killed the current buffer. */ |
333 | 737 { |
738 register Lisp_Object val; | |
739 int count = specpdl_ptr - specpdl; | |
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
740 Lisp_Object list; |
333 | 741 |
742 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
743 set_buffer_internal (b); | |
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
744 |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
745 /* First run the query functions; if any query is answered no, |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
746 don't kill the buffer. */ |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
747 for (list = Vkill_buffer_query_functions; !NILP (list); list = Fcdr (list)) |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
748 { |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
749 tem = call0 (Fcar (list)); |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
750 if (NILP (tem)) |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
751 return unbind_to (count, Qnil); |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
752 } |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
753 |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
754 /* Then run the hooks. */ |
333 | 755 call1 (Vrun_hooks, Qkill_buffer_hook); |
756 unbind_to (count, Qnil); | |
757 } | |
758 | |
759 /* We have no more questions to ask. Verify that it is valid | |
760 to kill the buffer. This must be done after the questions | |
761 since anything can happen within do_yes_or_no_p. */ | |
762 | |
763 /* Don't kill the minibuffer now current. */ | |
764 if (EQ (buf, XWINDOW (minibuf_window)->buffer)) | |
765 return Qnil; | |
766 | |
485 | 767 if (NILP (b->name)) |
333 | 768 return Qnil; |
769 | |
770 /* Make this buffer not be current. | |
771 In the process, notice if this is the sole visible buffer | |
772 and give up if so. */ | |
773 if (b == current_buffer) | |
774 { | |
1348
f6ab9d1e1709
(Fkill_buffer): Pass 2nd arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1308
diff
changeset
|
775 tem = Fother_buffer (buf, Qnil); |
333 | 776 Fset_buffer (tem); |
777 if (b == current_buffer) | |
778 return Qnil; | |
779 } | |
780 | |
781 /* Now there is no question: we can kill the buffer. */ | |
782 | |
783 #ifdef CLASH_DETECTION | |
784 /* Unlock this buffer's file, if it is locked. */ | |
785 unlock_buffer (b); | |
786 #endif /* CLASH_DETECTION */ | |
787 | |
788 kill_buffer_processes (buf); | |
789 | |
790 tem = Vinhibit_quit; | |
791 Vinhibit_quit = Qt; | |
792 Vbuffer_alist = Fdelq (Frassq (buf, Vbuffer_alist), Vbuffer_alist); | |
793 Freplace_buffer_in_windows (buf); | |
794 Vinhibit_quit = tem; | |
795 | |
796 /* Delete any auto-save file. */ | |
797 if (XTYPE (b->auto_save_file_name) == Lisp_String) | |
798 { | |
799 Lisp_Object tem; | |
800 tem = Fsymbol_value (intern ("delete-auto-save-files")); | |
485 | 801 if (! NILP (tem)) |
333 | 802 unlink (XSTRING (b->auto_save_file_name)->data); |
803 } | |
804 | |
805 /* Unchain all markers of this buffer | |
806 and leave them pointing nowhere. */ | |
807 for (tem = b->markers; !EQ (tem, Qnil); ) | |
808 { | |
809 m = XMARKER (tem); | |
810 m->buffer = 0; | |
811 tem = m->chain; | |
812 m->chain = Qnil; | |
813 } | |
814 b->markers = Qnil; | |
815 | |
1291
7c32612174c3
* buffer.c (reset_buffer): Do INITIALIZE_INTERVAL on the buffer's
Joseph Arceneaux <jla@gnu.org>
parents:
1281
diff
changeset
|
816 /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */ |
7c32612174c3
* buffer.c (reset_buffer): Do INITIALIZE_INTERVAL on the buffer's
Joseph Arceneaux <jla@gnu.org>
parents:
1281
diff
changeset
|
817 INITIALIZE_INTERVAL (b, NULL_INTERVAL); |
7c32612174c3
* buffer.c (reset_buffer): Do INITIALIZE_INTERVAL on the buffer's
Joseph Arceneaux <jla@gnu.org>
parents:
1281
diff
changeset
|
818 /* Perhaps we should explicitly free the interval tree here... */ |
7c32612174c3
* buffer.c (reset_buffer): Do INITIALIZE_INTERVAL on the buffer's
Joseph Arceneaux <jla@gnu.org>
parents:
1281
diff
changeset
|
819 |
333 | 820 b->name = Qnil; |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
821 BLOCK_INPUT; |
333 | 822 BUFFER_FREE (BUF_BEG_ADDR (b)); |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
823 UNBLOCK_INPUT; |
333 | 824 b->undo_list = Qnil; |
825 | |
826 return Qt; | |
827 } | |
828 | |
550 | 829 /* Move the assoc for buffer BUF to the front of buffer-alist. Since |
830 we do this each time BUF is selected visibly, the more recently | |
831 selected buffers are always closer to the front of the list. This | |
832 means that other_buffer is more likely to choose a relevant buffer. */ | |
333 | 833 |
834 record_buffer (buf) | |
835 Lisp_Object buf; | |
836 { | |
837 register Lisp_Object link, prev; | |
838 | |
839 prev = Qnil; | |
840 for (link = Vbuffer_alist; CONSP (link); link = XCONS (link)->cdr) | |
841 { | |
842 if (EQ (XCONS (XCONS (link)->car)->cdr, buf)) | |
843 break; | |
844 prev = link; | |
845 } | |
846 | |
550 | 847 /* Effectively do Vbuffer_alist = Fdelq (link, Vbuffer_alist); |
848 we cannot use Fdelq itself here because it allows quitting. */ | |
333 | 849 |
485 | 850 if (NILP (prev)) |
333 | 851 Vbuffer_alist = XCONS (Vbuffer_alist)->cdr; |
852 else | |
853 XCONS (prev)->cdr = XCONS (XCONS (prev)->cdr)->cdr; | |
854 | |
855 XCONS(link)->cdr = Vbuffer_alist; | |
856 Vbuffer_alist = link; | |
857 } | |
858 | |
859 DEFUN ("switch-to-buffer", Fswitch_to_buffer, Sswitch_to_buffer, 1, 2, "BSwitch to buffer: ", | |
860 "Select buffer BUFFER in the current window.\n\ | |
861 BUFFER may be a buffer or a buffer name.\n\ | |
862 Optional second arg NORECORD non-nil means\n\ | |
863 do not put this buffer at the front of the list of recently selected ones.\n\ | |
864 \n\ | |
865 WARNING: This is NOT the way to work on another buffer temporarily\n\ | |
866 within a Lisp program! Use `set-buffer' instead. That avoids messing with\n\ | |
867 the window-buffer correspondences.") | |
868 (bufname, norecord) | |
869 Lisp_Object bufname, norecord; | |
870 { | |
871 register Lisp_Object buf; | |
872 Lisp_Object tem; | |
873 | |
874 if (EQ (minibuf_window, selected_window)) | |
875 error ("Cannot switch buffers in minibuffer window"); | |
876 tem = Fwindow_dedicated_p (selected_window); | |
485 | 877 if (!NILP (tem)) |
333 | 878 error ("Cannot switch buffers in a dedicated window"); |
879 | |
485 | 880 if (NILP (bufname)) |
1348
f6ab9d1e1709
(Fkill_buffer): Pass 2nd arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1308
diff
changeset
|
881 buf = Fother_buffer (Fcurrent_buffer (), Qnil); |
333 | 882 else |
883 buf = Fget_buffer_create (bufname); | |
884 Fset_buffer (buf); | |
485 | 885 if (NILP (norecord)) |
333 | 886 record_buffer (buf); |
887 | |
888 Fset_window_buffer (EQ (selected_window, minibuf_window) | |
1909
ea6c75bc0d38
* buffer.c (Fswitch_to_buffer): Pass the correct number of
Jim Blandy <jimb@redhat.com>
parents:
1876
diff
changeset
|
889 ? Fnext_window (minibuf_window, Qnil, Qnil) |
ea6c75bc0d38
* buffer.c (Fswitch_to_buffer): Pass the correct number of
Jim Blandy <jimb@redhat.com>
parents:
1876
diff
changeset
|
890 : selected_window, |
333 | 891 buf); |
892 | |
3295
4d405f172c79
(reset_buffer): Clear mark_active field here.
Richard M. Stallman <rms@gnu.org>
parents:
3242
diff
changeset
|
893 return buf; |
333 | 894 } |
895 | |
896 DEFUN ("pop-to-buffer", Fpop_to_buffer, Spop_to_buffer, 1, 2, 0, | |
897 "Select buffer BUFFER in some window, preferably a different one.\n\ | |
898 If BUFFER is nil, then some other buffer is chosen.\n\ | |
899 If `pop-up-windows' is non-nil, windows can be split to do this.\n\ | |
900 If optional second arg OTHER-WINDOW is non-nil, insist on finding another\n\ | |
901 window even if BUFFER is already visible in the selected window.") | |
902 (bufname, other) | |
903 Lisp_Object bufname, other; | |
904 { | |
905 register Lisp_Object buf; | |
485 | 906 if (NILP (bufname)) |
1348
f6ab9d1e1709
(Fkill_buffer): Pass 2nd arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1308
diff
changeset
|
907 buf = Fother_buffer (Fcurrent_buffer (), Qnil); |
333 | 908 else |
909 buf = Fget_buffer_create (bufname); | |
910 Fset_buffer (buf); | |
911 record_buffer (buf); | |
912 Fselect_window (Fdisplay_buffer (buf, other)); | |
3295
4d405f172c79
(reset_buffer): Clear mark_active field here.
Richard M. Stallman <rms@gnu.org>
parents:
3242
diff
changeset
|
913 return buf; |
333 | 914 } |
915 | |
916 DEFUN ("current-buffer", Fcurrent_buffer, Scurrent_buffer, 0, 0, 0, | |
917 "Return the current buffer as a Lisp object.") | |
918 () | |
919 { | |
920 register Lisp_Object buf; | |
921 XSET (buf, Lisp_Buffer, current_buffer); | |
922 return buf; | |
923 } | |
924 | |
925 /* Set the current buffer to b */ | |
926 | |
927 void | |
928 set_buffer_internal (b) | |
929 register struct buffer *b; | |
930 { | |
931 register struct buffer *old_buf; | |
932 register Lisp_Object tail, valcontents; | |
933 enum Lisp_Type tem; | |
934 | |
935 if (current_buffer == b) | |
936 return; | |
937 | |
938 windows_or_buffers_changed = 1; | |
939 old_buf = current_buffer; | |
940 current_buffer = b; | |
941 last_known_column_point = -1; /* invalidate indentation cache */ | |
942 | |
943 /* Look down buffer's list of local Lisp variables | |
944 to find and update any that forward into C variables. */ | |
945 | |
485 | 946 for (tail = b->local_var_alist; !NILP (tail); tail = XCONS (tail)->cdr) |
333 | 947 { |
948 valcontents = XSYMBOL (XCONS (XCONS (tail)->car)->car)->value; | |
949 if ((XTYPE (valcontents) == Lisp_Buffer_Local_Value | |
950 || XTYPE (valcontents) == Lisp_Some_Buffer_Local_Value) | |
951 && (tem = XTYPE (XCONS (valcontents)->car), | |
952 (tem == Lisp_Boolfwd || tem == Lisp_Intfwd | |
953 || tem == Lisp_Objfwd))) | |
954 /* Just reference the variable | |
955 to cause it to become set for this buffer. */ | |
956 Fsymbol_value (XCONS (XCONS (tail)->car)->car); | |
957 } | |
958 | |
959 /* Do the same with any others that were local to the previous buffer */ | |
960 | |
961 if (old_buf) | |
485 | 962 for (tail = old_buf->local_var_alist; !NILP (tail); tail = XCONS (tail)->cdr) |
333 | 963 { |
964 valcontents = XSYMBOL (XCONS (XCONS (tail)->car)->car)->value; | |
965 if ((XTYPE (valcontents) == Lisp_Buffer_Local_Value | |
966 || XTYPE (valcontents) == Lisp_Some_Buffer_Local_Value) | |
967 && (tem = XTYPE (XCONS (valcontents)->car), | |
968 (tem == Lisp_Boolfwd || tem == Lisp_Intfwd | |
969 || tem == Lisp_Objfwd))) | |
970 /* Just reference the variable | |
971 to cause it to become set for this buffer. */ | |
972 Fsymbol_value (XCONS (XCONS (tail)->car)->car); | |
973 } | |
974 } | |
975 | |
976 DEFUN ("set-buffer", Fset_buffer, Sset_buffer, 1, 1, 0, | |
977 "Make the buffer BUFFER current for editing operations.\n\ | |
978 BUFFER may be a buffer or the name of an existing buffer.\n\ | |
979 See also `save-excursion' when you want to make a buffer current temporarily.\n\ | |
980 This function does not display the buffer, so its effect ends\n\ | |
981 when the current command terminates.\n\ | |
982 Use `switch-to-buffer' or `pop-to-buffer' to switch buffers permanently.") | |
983 (bufname) | |
984 register Lisp_Object bufname; | |
985 { | |
986 register Lisp_Object buffer; | |
987 buffer = Fget_buffer (bufname); | |
485 | 988 if (NILP (buffer)) |
333 | 989 nsberror (bufname); |
485 | 990 if (NILP (XBUFFER (buffer)->name)) |
333 | 991 error ("Selecting deleted buffer"); |
992 set_buffer_internal (XBUFFER (buffer)); | |
993 return buffer; | |
994 } | |
995 | |
996 DEFUN ("barf-if-buffer-read-only", Fbarf_if_buffer_read_only, | |
997 Sbarf_if_buffer_read_only, 0, 0, 0, | |
998 "Signal a `buffer-read-only' error if the current buffer is read-only.") | |
999 () | |
1000 { | |
3481
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
1001 if (!NILP (current_buffer->read_only) |
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
1002 && NILP (Vinhibit_read_only)) |
333 | 1003 Fsignal (Qbuffer_read_only, (Fcons (Fcurrent_buffer (), Qnil))); |
1004 return Qnil; | |
1005 } | |
1006 | |
1007 DEFUN ("bury-buffer", Fbury_buffer, Sbury_buffer, 0, 1, "", | |
1008 "Put BUFFER at the end of the list of all buffers.\n\ | |
1009 There it is the least likely candidate for `other-buffer' to return;\n\ | |
739
0bb85f26b79c
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
648
diff
changeset
|
1010 thus, the least likely buffer for \\[switch-to-buffer] to select by default.\n\ |
1586
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
1011 If BUFFER is nil or omitted, bury the current buffer.\n\ |
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
1012 Also, if BUFFER is nil or omitted, remove the current buffer from the\n\ |
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
1013 selected window if it is displayed there.") |
333 | 1014 (buf) |
1015 register Lisp_Object buf; | |
1016 { | |
1252
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1017 /* Figure out what buffer we're going to bury. */ |
485 | 1018 if (NILP (buf)) |
1586
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
1019 { |
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
1020 XSET (buf, Lisp_Buffer, current_buffer); |
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
1021 |
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
1022 /* If we're burying the current buffer, unshow it. */ |
1909
ea6c75bc0d38
* buffer.c (Fswitch_to_buffer): Pass the correct number of
Jim Blandy <jimb@redhat.com>
parents:
1876
diff
changeset
|
1023 Fswitch_to_buffer (Fother_buffer (buf, Qnil), Qnil); |
1586
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
1024 } |
333 | 1025 else |
1026 { | |
1027 Lisp_Object buf1; | |
1028 | |
1029 buf1 = Fget_buffer (buf); | |
485 | 1030 if (NILP (buf1)) |
333 | 1031 nsberror (buf); |
1032 buf = buf1; | |
1252
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1033 } |
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1034 |
1586
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
1035 /* Move buf to the end of the buffer list. */ |
1252
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1036 { |
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1037 register Lisp_Object aelt, link; |
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1038 |
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1039 aelt = Frassq (buf, Vbuffer_alist); |
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1040 link = Fmemq (aelt, Vbuffer_alist); |
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1041 Vbuffer_alist = Fdelq (aelt, Vbuffer_alist); |
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1042 XCONS (link)->cdr = Qnil; |
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1043 Vbuffer_alist = nconc2 (Vbuffer_alist, link); |
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1044 } |
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
1045 |
333 | 1046 return Qnil; |
1047 } | |
1048 | |
1953
714df59790af
(Ferase_buffer): Added interactive spec.
Roland McGrath <roland@gnu.org>
parents:
1952
diff
changeset
|
1049 DEFUN ("erase-buffer", Ferase_buffer, Serase_buffer, 0, 0, "*", |
333 | 1050 "Delete the entire contents of the current buffer.\n\ |
4942
0ea29f510ba0
(Ferase_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
4852
diff
changeset
|
1051 Any narrowing restriction in effect (see `narrow-to-region') is removed,\n\ |
333 | 1052 so the buffer is truly empty after this.") |
1053 () | |
1054 { | |
1055 Fwiden (); | |
1056 del_range (BEG, Z); | |
1057 current_buffer->last_window_start = 1; | |
1058 /* Prevent warnings, or suspension of auto saving, that would happen | |
1059 if future size is less than past size. Use of erase-buffer | |
1060 implies that the future text is not really related to the past text. */ | |
1061 XFASTINT (current_buffer->save_length) = 0; | |
1062 return Qnil; | |
1063 } | |
1064 | |
1065 validate_region (b, e) | |
1066 register Lisp_Object *b, *e; | |
1067 { | |
1068 register int i; | |
1069 | |
1070 CHECK_NUMBER_COERCE_MARKER (*b, 0); | |
1071 CHECK_NUMBER_COERCE_MARKER (*e, 1); | |
1072 | |
1073 if (XINT (*b) > XINT (*e)) | |
1074 { | |
1075 i = XFASTINT (*b); /* This is legit even if *b is < 0 */ | |
1076 *b = *e; | |
1077 XFASTINT (*e) = i; /* because this is all we do with i. */ | |
1078 } | |
1079 | |
1080 if (!(BEGV <= XINT (*b) && XINT (*b) <= XINT (*e) | |
1081 && XINT (*e) <= ZV)) | |
1082 args_out_of_range (*b, *e); | |
1083 } | |
1084 | |
1085 Lisp_Object | |
1086 list_buffers_1 (files) | |
1087 Lisp_Object files; | |
1088 { | |
1089 register Lisp_Object tail, tem, buf; | |
1090 Lisp_Object col1, col2, col3, minspace; | |
1091 register struct buffer *old = current_buffer, *b; | |
3884
19b4e1fef348
* buffer.c (list_buffers_1): Make desired_point a lisp object; set
Jim Blandy <jimb@redhat.com>
parents:
3802
diff
changeset
|
1092 Lisp_Object desired_point; |
333 | 1093 Lisp_Object other_file_symbol; |
1094 | |
3884
19b4e1fef348
* buffer.c (list_buffers_1): Make desired_point a lisp object; set
Jim Blandy <jimb@redhat.com>
parents:
3802
diff
changeset
|
1095 desired_point = Qnil; |
333 | 1096 other_file_symbol = intern ("list-buffers-directory"); |
1097 | |
1098 XFASTINT (col1) = 19; | |
1099 XFASTINT (col2) = 25; | |
1100 XFASTINT (col3) = 40; | |
1101 XFASTINT (minspace) = 1; | |
1102 | |
1103 Fset_buffer (Vstandard_output); | |
1104 | |
1105 tail = intern ("Buffer-menu-mode"); | |
1106 if (!EQ (tail, current_buffer->major_mode) | |
485 | 1107 && (tem = Ffboundp (tail), !NILP (tem))) |
333 | 1108 call0 (tail); |
1109 Fbuffer_disable_undo (Vstandard_output); | |
1110 current_buffer->read_only = Qnil; | |
1111 | |
1112 write_string ("\ | |
1113 MR Buffer Size Mode File\n\ | |
1114 -- ------ ---- ---- ----\n", -1); | |
1115 | |
485 | 1116 for (tail = Vbuffer_alist; !NILP (tail); tail = Fcdr (tail)) |
333 | 1117 { |
1118 buf = Fcdr (Fcar (tail)); | |
1119 b = XBUFFER (buf); | |
1120 /* Don't mention the minibuffers. */ | |
1121 if (XSTRING (b->name)->data[0] == ' ') | |
1122 continue; | |
1123 /* Optionally don't mention buffers that lack files. */ | |
485 | 1124 if (!NILP (files) && NILP (b->filename)) |
333 | 1125 continue; |
1126 /* Identify the current buffer. */ | |
1127 if (b == old) | |
3884
19b4e1fef348
* buffer.c (list_buffers_1): Make desired_point a lisp object; set
Jim Blandy <jimb@redhat.com>
parents:
3802
diff
changeset
|
1128 XFASTINT (desired_point) = point; |
333 | 1129 write_string (b == old ? "." : " ", -1); |
1130 /* Identify modified buffers */ | |
1131 write_string (BUF_MODIFF (b) > b->save_modified ? "*" : " ", -1); | |
485 | 1132 write_string (NILP (b->read_only) ? " " : "% ", -1); |
333 | 1133 Fprinc (b->name, Qnil); |
1134 Findent_to (col1, make_number (2)); | |
1135 XFASTINT (tem) = BUF_Z (b) - BUF_BEG (b); | |
1136 Fprin1 (tem, Qnil); | |
1137 Findent_to (col2, minspace); | |
1138 Fprinc (b->mode_name, Qnil); | |
1139 Findent_to (col3, minspace); | |
1140 | |
485 | 1141 if (!NILP (b->filename)) |
333 | 1142 Fprinc (b->filename, Qnil); |
1143 else | |
1144 { | |
1145 /* No visited file; check local value of list-buffers-directory. */ | |
1146 Lisp_Object tem; | |
1147 set_buffer_internal (b); | |
1148 tem = Fboundp (other_file_symbol); | |
485 | 1149 if (!NILP (tem)) |
333 | 1150 { |
1151 tem = Fsymbol_value (other_file_symbol); | |
1152 Fset_buffer (Vstandard_output); | |
1153 if (XTYPE (tem) == Lisp_String) | |
1154 Fprinc (tem, Qnil); | |
1155 } | |
1156 else | |
1157 Fset_buffer (Vstandard_output); | |
1158 } | |
1159 write_string ("\n", -1); | |
1160 } | |
1161 | |
1162 current_buffer->read_only = Qt; | |
1163 set_buffer_internal (old); | |
3884
19b4e1fef348
* buffer.c (list_buffers_1): Make desired_point a lisp object; set
Jim Blandy <jimb@redhat.com>
parents:
3802
diff
changeset
|
1164 return desired_point; |
333 | 1165 } |
1166 | |
1167 DEFUN ("list-buffers", Flist_buffers, Slist_buffers, 0, 1, "P", | |
1168 "Display a list of names of existing buffers.\n\ | |
1169 The list is displayed in a buffer named `*Buffer List*'.\n\ | |
1170 Note that buffers with names starting with spaces are omitted.\n\ | |
1171 Non-null optional arg FILES-ONLY means mention only file buffers.\n\ | |
1172 \n\ | |
1173 The M column contains a * for buffers that are modified.\n\ | |
1174 The R column contains a % for buffers that are read-only.") | |
1175 (files) | |
1176 Lisp_Object files; | |
1177 { | |
3753
16948869ab5b
* buffer.c (list_buffers_1): Return the desired point.
Jim Blandy <jimb@redhat.com>
parents:
3665
diff
changeset
|
1178 Lisp_Object desired_point; |
16948869ab5b
* buffer.c (list_buffers_1): Return the desired point.
Jim Blandy <jimb@redhat.com>
parents:
3665
diff
changeset
|
1179 |
5070
3dab6fdd6bc6
(Flist_buffers): Always return a value.
Richard M. Stallman <rms@gnu.org>
parents:
5043
diff
changeset
|
1180 desired_point |
3dab6fdd6bc6
(Flist_buffers): Always return a value.
Richard M. Stallman <rms@gnu.org>
parents:
5043
diff
changeset
|
1181 = internal_with_output_to_temp_buffer ("*Buffer List*", |
3dab6fdd6bc6
(Flist_buffers): Always return a value.
Richard M. Stallman <rms@gnu.org>
parents:
5043
diff
changeset
|
1182 list_buffers_1, files); |
3753
16948869ab5b
* buffer.c (list_buffers_1): Return the desired point.
Jim Blandy <jimb@redhat.com>
parents:
3665
diff
changeset
|
1183 |
3884
19b4e1fef348
* buffer.c (list_buffers_1): Make desired_point a lisp object; set
Jim Blandy <jimb@redhat.com>
parents:
3802
diff
changeset
|
1184 if (NUMBERP (desired_point)) |
19b4e1fef348
* buffer.c (list_buffers_1): Make desired_point a lisp object; set
Jim Blandy <jimb@redhat.com>
parents:
3802
diff
changeset
|
1185 { |
19b4e1fef348
* buffer.c (list_buffers_1): Make desired_point a lisp object; set
Jim Blandy <jimb@redhat.com>
parents:
3802
diff
changeset
|
1186 int count = specpdl_ptr - specpdl; |
19b4e1fef348
* buffer.c (list_buffers_1): Make desired_point a lisp object; set
Jim Blandy <jimb@redhat.com>
parents:
3802
diff
changeset
|
1187 record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); |
19b4e1fef348
* buffer.c (list_buffers_1): Make desired_point a lisp object; set
Jim Blandy <jimb@redhat.com>
parents:
3802
diff
changeset
|
1188 Fset_buffer (build_string ("*Buffer List*")); |
19b4e1fef348
* buffer.c (list_buffers_1): Make desired_point a lisp object; set
Jim Blandy <jimb@redhat.com>
parents:
3802
diff
changeset
|
1189 SET_PT (XINT (desired_point)); |
19b4e1fef348
* buffer.c (list_buffers_1): Make desired_point a lisp object; set
Jim Blandy <jimb@redhat.com>
parents:
3802
diff
changeset
|
1190 return unbind_to (count, Qnil); |
19b4e1fef348
* buffer.c (list_buffers_1): Make desired_point a lisp object; set
Jim Blandy <jimb@redhat.com>
parents:
3802
diff
changeset
|
1191 } |
5070
3dab6fdd6bc6
(Flist_buffers): Always return a value.
Richard M. Stallman <rms@gnu.org>
parents:
5043
diff
changeset
|
1192 return Qnil; |
333 | 1193 } |
1194 | |
1195 DEFUN ("kill-all-local-variables", Fkill_all_local_variables, Skill_all_local_variables, | |
1196 0, 0, 0, | |
1197 "Switch to Fundamental mode by killing current buffer's local variables.\n\ | |
1198 Most local variable bindings are eliminated so that the default values\n\ | |
1199 become effective once more. Also, the syntax table is set from\n\ | |
1200 `standard-syntax-table', the local keymap is set to nil,\n\ | |
1201 and the abbrev table from `fundamental-mode-abbrev-table'.\n\ | |
1202 This function also forces redisplay of the mode line.\n\ | |
1203 \n\ | |
1204 Every function to select a new major mode starts by\n\ | |
1205 calling this function.\n\n\ | |
1206 As a special exception, local variables whose names have\n\ | |
1207 a non-nil `permanent-local' property are not eliminated by this function.") | |
1208 () | |
1209 { | |
1210 register Lisp_Object alist, sym, tem; | |
1211 Lisp_Object oalist; | |
5873
fa8b769ef564
(Fkill_all_local_variables): Run change-major-mode-hook.
Karl Heuer <kwzh@gnu.org>
parents:
5857
diff
changeset
|
1212 |
fa8b769ef564
(Fkill_all_local_variables): Run change-major-mode-hook.
Karl Heuer <kwzh@gnu.org>
parents:
5857
diff
changeset
|
1213 call1 (Vrun_hooks, intern ("change-major-mode-hook")); |
333 | 1214 oalist = current_buffer->local_var_alist; |
1215 | |
1216 /* Make sure no local variables remain set up with this buffer | |
1217 for their current values. */ | |
1218 | |
485 | 1219 for (alist = oalist; !NILP (alist); alist = XCONS (alist)->cdr) |
333 | 1220 { |
1221 sym = XCONS (XCONS (alist)->car)->car; | |
1222 | |
1223 /* Need not do anything if some other buffer's binding is now encached. */ | |
1224 tem = XCONS (XCONS (XSYMBOL (sym)->value)->cdr)->car; | |
1225 if (XBUFFER (tem) == current_buffer) | |
1226 { | |
1227 /* Symbol is set up for this buffer's old local value. | |
1228 Set it up for the current buffer with the default value. */ | |
1229 | |
1230 tem = XCONS (XCONS (XSYMBOL (sym)->value)->cdr)->cdr; | |
2486
d5d7e6996604
(Fkill_all_local_variables): Store each var's current value
Richard M. Stallman <rms@gnu.org>
parents:
2480
diff
changeset
|
1231 /* Store the symbol's current value into the alist entry |
d5d7e6996604
(Fkill_all_local_variables): Store each var's current value
Richard M. Stallman <rms@gnu.org>
parents:
2480
diff
changeset
|
1232 it is currently set up for. This is so that, if the |
d5d7e6996604
(Fkill_all_local_variables): Store each var's current value
Richard M. Stallman <rms@gnu.org>
parents:
2480
diff
changeset
|
1233 local is marked permanent, and we make it local again below, |
d5d7e6996604
(Fkill_all_local_variables): Store each var's current value
Richard M. Stallman <rms@gnu.org>
parents:
2480
diff
changeset
|
1234 we don't lose the value. */ |
5703 | 1235 XCONS (XCONS (tem)->car)->cdr |
1236 = do_symval_forwarding (XCONS (XSYMBOL (sym)->value)->car); | |
2486
d5d7e6996604
(Fkill_all_local_variables): Store each var's current value
Richard M. Stallman <rms@gnu.org>
parents:
2480
diff
changeset
|
1237 /* Switch to the symbol's default-value alist entry. */ |
333 | 1238 XCONS (tem)->car = tem; |
2486
d5d7e6996604
(Fkill_all_local_variables): Store each var's current value
Richard M. Stallman <rms@gnu.org>
parents:
2480
diff
changeset
|
1239 /* Mark it as current for the current buffer. */ |
333 | 1240 XCONS (XCONS (XSYMBOL (sym)->value)->cdr)->car = Fcurrent_buffer (); |
2486
d5d7e6996604
(Fkill_all_local_variables): Store each var's current value
Richard M. Stallman <rms@gnu.org>
parents:
2480
diff
changeset
|
1241 /* Store the current value into any forwarding in the symbol. */ |
333 | 1242 store_symval_forwarding (sym, XCONS (XSYMBOL (sym)->value)->car, |
1243 XCONS (tem)->cdr); | |
1244 } | |
1245 } | |
1246 | |
1247 /* Actually eliminate all local bindings of this buffer. */ | |
1248 | |
1249 reset_buffer_local_variables (current_buffer); | |
1250 | |
1251 /* Redisplay mode lines; we are changing major mode. */ | |
1252 | |
1253 update_mode_lines++; | |
1254 | |
1255 /* Any which are supposed to be permanent, | |
1256 make local again, with the same values they had. */ | |
1257 | |
485 | 1258 for (alist = oalist; !NILP (alist); alist = XCONS (alist)->cdr) |
333 | 1259 { |
1260 sym = XCONS (XCONS (alist)->car)->car; | |
1261 tem = Fget (sym, Qpermanent_local); | |
485 | 1262 if (! NILP (tem)) |
392 | 1263 { |
1264 Fmake_local_variable (sym); | |
1265 Fset (sym, XCONS (XCONS (alist)->car)->cdr); | |
1266 } | |
333 | 1267 } |
1268 | |
1269 /* Force mode-line redisplay. Useful here because all major mode | |
1270 commands call this function. */ | |
1271 update_mode_lines++; | |
1272 | |
1273 return Qnil; | |
1274 } | |
1275 | |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1276 /* Find all the overlays in the current buffer that contain position POS. |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1277 Return the number found, and store them in a vector in *VEC_PTR. |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1278 Store in *LEN_PTR the size allocated for the vector. |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1279 Store in *NEXT_PTR the next position after POS where an overlay starts, |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1280 or ZV if there are no more overlays. |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1281 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1282 *VEC_PTR and *LEN_PTR should contain a valid vector and size |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1283 when this function is called. |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1284 |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1285 If EXTEND is non-zero, we make the vector bigger if necessary. |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1286 If EXTEND is zero, we never extend the vector, |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1287 and we store only as many overlays as will fit. |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1288 But we still return the total number of overlays. */ |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1289 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1290 int |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1291 overlays_at (pos, extend, vec_ptr, len_ptr, next_ptr) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1292 int pos; |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1293 int extend; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1294 Lisp_Object **vec_ptr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1295 int *len_ptr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1296 int *next_ptr; |
333 | 1297 { |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1298 Lisp_Object tail, overlay, start, end, result; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1299 int idx = 0; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1300 int len = *len_ptr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1301 Lisp_Object *vec = *vec_ptr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1302 int next = ZV; |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1303 int inhibit_storing = 0; |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1304 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1305 for (tail = current_buffer->overlays_before; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1306 CONSP (tail); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1307 tail = XCONS (tail)->cdr) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1308 { |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1309 int startpos; |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1310 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1311 overlay = XCONS (tail)->car; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1312 if (! OVERLAY_VALID (overlay)) |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1313 abort (); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1314 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1315 start = OVERLAY_START (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1316 end = OVERLAY_END (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1317 if (OVERLAY_POSITION (end) <= pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1318 break; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1319 startpos = OVERLAY_POSITION (start); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1320 if (startpos <= pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1321 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1322 if (idx == len) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1323 { |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1324 /* The supplied vector is full. |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1325 Either make it bigger, or don't store any more in it. */ |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1326 if (extend) |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1327 { |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1328 *len_ptr = len *= 2; |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1329 vec = (Lisp_Object *) xrealloc (vec, len * sizeof (Lisp_Object)); |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1330 *vec_ptr = vec; |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1331 } |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1332 else |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1333 inhibit_storing = 1; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1334 } |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1335 |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1336 if (!inhibit_storing) |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1337 vec[idx] = overlay; |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1338 /* Keep counting overlays even if we can't return them all. */ |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1339 idx++; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1340 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1341 else if (startpos < next) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1342 next = startpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1343 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1344 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1345 for (tail = current_buffer->overlays_after; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1346 CONSP (tail); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1347 tail = XCONS (tail)->cdr) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1348 { |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1349 int startpos; |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1350 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1351 overlay = XCONS (tail)->car; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1352 if (! OVERLAY_VALID (overlay)) |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1353 abort (); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1354 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1355 start = OVERLAY_START (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1356 end = OVERLAY_END (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1357 startpos = OVERLAY_POSITION (start); |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1358 if (pos < startpos) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1359 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1360 if (startpos < next) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1361 next = startpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1362 break; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1363 } |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1364 if (pos < OVERLAY_POSITION (end)) |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1365 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1366 if (idx == len) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1367 { |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1368 if (extend) |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1369 { |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1370 *len_ptr = len *= 2; |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1371 vec = (Lisp_Object *) xrealloc (vec, len * sizeof (Lisp_Object)); |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1372 *vec_ptr = vec; |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1373 } |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1374 else |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1375 inhibit_storing = 1; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1376 } |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1377 |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1378 if (!inhibit_storing) |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1379 vec[idx] = overlay; |
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1380 idx++; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1381 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1382 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1383 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1384 *next_ptr = next; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1385 return idx; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1386 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1387 |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1388 struct sortvec |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1389 { |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1390 Lisp_Object overlay; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1391 int beg, end; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1392 int priority; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1393 }; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1394 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1395 static int |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1396 compare_overlays (s1, s2) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1397 struct sortvec *s1, *s2; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1398 { |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1399 if (s1->priority != s2->priority) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1400 return s1->priority - s2->priority; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1401 if (s1->beg != s2->beg) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1402 return s1->beg - s2->beg; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1403 if (s1->end != s2->end) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1404 return s2->end - s1->end; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1405 return 0; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1406 } |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1407 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1408 /* Sort an array of overlays by priority. The array is modified in place. |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1409 The return value is the new size; this may be smaller than the original |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1410 size if some of the overlays were invalid or were window-specific. */ |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1411 int |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1412 sort_overlays (overlay_vec, noverlays, w) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1413 Lisp_Object *overlay_vec; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1414 int noverlays; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1415 struct window *w; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1416 { |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1417 int i, j; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1418 struct sortvec *sortvec; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1419 sortvec = (struct sortvec *) alloca (noverlays * sizeof (struct sortvec)); |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1420 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1421 /* Put the valid and relevant overlays into sortvec. */ |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1422 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1423 for (i = 0, j = 0; i < noverlays; i++) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1424 { |
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1425 Lisp_Object tem; |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1426 Lisp_Object overlay = overlay_vec[i]; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1427 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1428 if (OVERLAY_VALID (overlay) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1429 && OVERLAY_POSITION (OVERLAY_START (overlay)) > 0 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1430 && OVERLAY_POSITION (OVERLAY_END (overlay)) > 0) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1431 { |
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1432 /* If we're interested in a specific window, then ignore |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1433 overlays that are limited to some other window. */ |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1434 if (w) |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1435 { |
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1436 Lisp_Object window; |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1437 |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1438 window = Foverlay_get (overlay, Qwindow); |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1439 if (XTYPE (window) == Lisp_Window && XWINDOW (window) != w) |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1440 continue; |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1441 } |
6061
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1442 |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1443 /* This overlay is good and counts: put it into sortvec. */ |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1444 sortvec[j].overlay = overlay; |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1445 sortvec[j].beg = OVERLAY_POSITION (OVERLAY_START (overlay)); |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1446 sortvec[j].end = OVERLAY_POSITION (OVERLAY_END (overlay)); |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1447 tem = Foverlay_get (overlay, Qpriority); |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1448 if (INTEGERP (tem)) |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1449 sortvec[j].priority = XINT (tem); |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1450 else |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1451 sortvec[j].priority = 0; |
e40292d5c167
(sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents:
6051
diff
changeset
|
1452 j++; |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1453 } |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1454 } |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1455 noverlays = j; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1456 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1457 /* Sort the overlays into the proper order: increasing priority. */ |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1458 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1459 if (noverlays > 1) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1460 qsort (sortvec, noverlays, sizeof (struct sortvec), compare_overlays); |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1461 |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1462 for (i = 0; i < noverlays; i++) |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1463 overlay_vec[i] = sortvec[i].overlay; |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1464 return (noverlays); |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1465 } |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
1466 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1467 /* Shift overlays in BUF's overlay lists, to center the lists at POS. */ |
333 | 1468 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1469 void |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1470 recenter_overlay_lists (buf, pos) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1471 struct buffer *buf; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1472 int pos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1473 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1474 Lisp_Object overlay, tail, next, prev, beg, end; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1475 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1476 /* See if anything in overlays_before should move to overlays_after. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1477 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1478 /* We don't strictly need prev in this loop; it should always be nil. |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1479 But we use it for symmetry and in case that should cease to be true |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1480 with some future change. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1481 prev = Qnil; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1482 for (tail = buf->overlays_before; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1483 CONSP (tail); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1484 prev = tail, tail = next) |
333 | 1485 { |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1486 next = XCONS (tail)->cdr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1487 overlay = XCONS (tail)->car; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1488 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1489 /* If the overlay is not valid, get rid of it. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1490 if (!OVERLAY_VALID (overlay)) |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1491 #if 1 |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1492 abort (); |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1493 #else |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1494 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1495 /* Splice the cons cell TAIL out of overlays_before. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1496 if (!NILP (prev)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1497 XCONS (prev)->cdr = next; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1498 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1499 buf->overlays_before = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1500 tail = prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1501 continue; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1502 } |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1503 #endif |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1504 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1505 beg = OVERLAY_START (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1506 end = OVERLAY_END (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1507 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1508 if (OVERLAY_POSITION (end) > pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1509 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1510 /* OVERLAY needs to be moved. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1511 int where = OVERLAY_POSITION (beg); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1512 Lisp_Object other, other_prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1513 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1514 /* Splice the cons cell TAIL out of overlays_before. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1515 if (!NILP (prev)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1516 XCONS (prev)->cdr = next; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1517 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1518 buf->overlays_before = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1519 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1520 /* Search thru overlays_after for where to put it. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1521 other_prev = Qnil; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1522 for (other = buf->overlays_after; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1523 CONSP (other); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1524 other_prev = other, other = XCONS (other)->cdr) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1525 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1526 Lisp_Object otherbeg, otheroverlay, follower; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1527 int win; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1528 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1529 otheroverlay = XCONS (other)->car; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1530 if (! OVERLAY_VALID (otheroverlay)) |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1531 abort (); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1532 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1533 otherbeg = OVERLAY_START (otheroverlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1534 if (OVERLAY_POSITION (otherbeg) >= where) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1535 break; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1536 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1537 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1538 /* Add TAIL to overlays_after before OTHER. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1539 XCONS (tail)->cdr = other; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1540 if (!NILP (other_prev)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1541 XCONS (other_prev)->cdr = tail; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1542 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1543 buf->overlays_after = tail; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1544 tail = prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1545 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1546 else |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1547 /* We've reached the things that should stay in overlays_before. |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1548 All the rest of overlays_before must end even earlier, |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1549 so stop now. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1550 break; |
333 | 1551 } |
1552 | |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1553 /* See if anything in overlays_after should be in overlays_before. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1554 prev = Qnil; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1555 for (tail = buf->overlays_after; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1556 CONSP (tail); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1557 prev = tail, tail = next) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1558 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1559 next = XCONS (tail)->cdr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1560 overlay = XCONS (tail)->car; |
333 | 1561 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1562 /* If the overlay is not valid, get rid of it. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1563 if (!OVERLAY_VALID (overlay)) |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1564 #if 1 |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1565 abort (); |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1566 #else |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1567 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1568 /* Splice the cons cell TAIL out of overlays_after. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1569 if (!NILP (prev)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1570 XCONS (prev)->cdr = next; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1571 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1572 buf->overlays_after = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1573 tail = prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1574 continue; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1575 } |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1576 #endif |
333 | 1577 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1578 beg = OVERLAY_START (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1579 end = OVERLAY_END (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1580 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1581 /* Stop looking, when we know that nothing further |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1582 can possibly end before POS. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1583 if (OVERLAY_POSITION (beg) > pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1584 break; |
333 | 1585 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1586 if (OVERLAY_POSITION (end) <= pos) |
333 | 1587 { |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1588 /* OVERLAY needs to be moved. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1589 int where = OVERLAY_POSITION (end); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1590 Lisp_Object other, other_prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1591 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1592 /* Splice the cons cell TAIL out of overlays_after. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1593 if (!NILP (prev)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1594 XCONS (prev)->cdr = next; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1595 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1596 buf->overlays_after = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1597 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1598 /* Search thru overlays_before for where to put it. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1599 other_prev = Qnil; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1600 for (other = buf->overlays_before; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1601 CONSP (other); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1602 other_prev = other, other = XCONS (other)->cdr) |
333 | 1603 { |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1604 Lisp_Object otherend, otheroverlay; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1605 int win; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1606 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1607 otheroverlay = XCONS (other)->car; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1608 if (! OVERLAY_VALID (otheroverlay)) |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1609 abort (); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1610 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1611 otherend = OVERLAY_END (otheroverlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1612 if (OVERLAY_POSITION (otherend) <= where) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1613 break; |
333 | 1614 } |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1615 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1616 /* Add TAIL to overlays_before before OTHER. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1617 XCONS (tail)->cdr = other; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1618 if (!NILP (other_prev)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1619 XCONS (other_prev)->cdr = tail; |
333 | 1620 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1621 buf->overlays_before = tail; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1622 tail = prev; |
333 | 1623 } |
1624 } | |
1625 | |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1626 XFASTINT (buf->overlay_center) = pos; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1627 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1628 |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1629 DEFUN ("overlayp", Foverlayp, Soverlayp, 1, 1, 0, |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1630 "Return t if OBJECT is an overlay.") |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1631 (object) |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1632 Lisp_Object object; |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1633 { |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1634 return (OVERLAYP (object) ? Qt : Qnil); |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1635 } |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1636 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1637 DEFUN ("make-overlay", Fmake_overlay, Smake_overlay, 2, 3, 0, |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1638 "Create a new overlay with range BEG to END in BUFFER.\n\ |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1639 If omitted, BUFFER defaults to the current buffer.\n\ |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1640 BEG and END may be integers or markers.") |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1641 (beg, end, buffer) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1642 Lisp_Object beg, end, buffer; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1643 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1644 Lisp_Object overlay; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1645 struct buffer *b; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1646 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1647 if (NILP (buffer)) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1648 XSET (buffer, Lisp_Buffer, current_buffer); |
3031
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1649 else |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1650 CHECK_BUFFER (buffer, 2); |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1651 if (MARKERP (beg) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1652 && ! EQ (Fmarker_buffer (beg), buffer)) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1653 error ("Marker points into wrong buffer"); |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1654 if (MARKERP (end) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1655 && ! EQ (Fmarker_buffer (end), buffer)) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1656 error ("Marker points into wrong buffer"); |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1657 |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1658 CHECK_NUMBER_COERCE_MARKER (beg, 1); |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1659 CHECK_NUMBER_COERCE_MARKER (end, 1); |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1660 |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1661 if (XINT (beg) > XINT (end)) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1662 { |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1663 Lisp_Object temp = beg; |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1664 beg = end; end = temp; |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1665 } |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1666 |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1667 b = XBUFFER (buffer); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1668 |
3031
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1669 beg = Fset_marker (Fmake_marker (), beg, buffer); |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1670 end = Fset_marker (Fmake_marker (), end, buffer); |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1671 |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1672 overlay = Fcons (Fcons (beg, end), Qnil); |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1673 XSETTYPE (overlay, Lisp_Overlay); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1674 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1675 /* Put the new overlay on the wrong list. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1676 end = OVERLAY_END (overlay); |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1677 if (OVERLAY_POSITION (end) < XINT (b->overlay_center)) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1678 b->overlays_after = Fcons (overlay, b->overlays_after); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1679 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1680 b->overlays_before = Fcons (overlay, b->overlays_before); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1681 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1682 /* This puts it in the right list, and in the right order. */ |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1683 recenter_overlay_lists (b, XINT (b->overlay_center)); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1684 |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
1685 /* We don't need to redisplay the region covered by the overlay, because |
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
1686 the overlay has no properties at the moment. */ |
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
1687 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1688 return overlay; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1689 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1690 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1691 DEFUN ("move-overlay", Fmove_overlay, Smove_overlay, 3, 4, 0, |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1692 "Set the endpoints of OVERLAY to BEG and END in BUFFER.\n\ |
2791
4f234fbfb02c
* buffer.c (Fmove_overlay): If the overlay is in no buffer and the
Jim Blandy <jimb@redhat.com>
parents:
2787
diff
changeset
|
1693 If BUFFER is omitted, leave OVERLAY in the same buffer it inhabits now.\n\ |
4f234fbfb02c
* buffer.c (Fmove_overlay): If the overlay is in no buffer and the
Jim Blandy <jimb@redhat.com>
parents:
2787
diff
changeset
|
1694 If BUFFER is omitted, and OVERLAY is in no buffer, put it in the current\n\ |
4f234fbfb02c
* buffer.c (Fmove_overlay): If the overlay is in no buffer and the
Jim Blandy <jimb@redhat.com>
parents:
2787
diff
changeset
|
1695 buffer.") |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1696 (overlay, beg, end, buffer) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1697 Lisp_Object overlay, beg, end, buffer; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1698 { |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
1699 struct buffer *b, *ob; |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
1700 Lisp_Object obuffer; |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
1701 int count = specpdl_ptr - specpdl; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1702 |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1703 CHECK_OVERLAY (overlay, 0); |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1704 if (NILP (buffer)) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1705 buffer = Fmarker_buffer (OVERLAY_START (overlay)); |
2791
4f234fbfb02c
* buffer.c (Fmove_overlay): If the overlay is in no buffer and the
Jim Blandy <jimb@redhat.com>
parents:
2787
diff
changeset
|
1706 if (NILP (buffer)) |
4f234fbfb02c
* buffer.c (Fmove_overlay): If the overlay is in no buffer and the
Jim Blandy <jimb@redhat.com>
parents:
2787
diff
changeset
|
1707 XSET (buffer, Lisp_Buffer, current_buffer); |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1708 CHECK_BUFFER (buffer, 3); |
3031
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1709 |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1710 if (MARKERP (beg) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1711 && ! EQ (Fmarker_buffer (beg), buffer)) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1712 error ("Marker points into wrong buffer"); |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1713 if (MARKERP (end) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1714 && ! EQ (Fmarker_buffer (end), buffer)) |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1715 error ("Marker points into wrong buffer"); |
5c96dfc52433
* buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
1716 |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
1717 CHECK_NUMBER_COERCE_MARKER (beg, 1); |
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
1718 CHECK_NUMBER_COERCE_MARKER (end, 1); |
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
1719 |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
1720 specbind (Qinhibit_quit, Qt); |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
1721 |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
1722 if (XINT (beg) > XINT (end)) |
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
1723 { |
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
1724 Lisp_Object temp = beg; |
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
1725 beg = end; end = temp; |
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
1726 } |
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
1727 |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
1728 obuffer = Fmarker_buffer (OVERLAY_START (overlay)); |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1729 b = XBUFFER (buffer); |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
1730 ob = XBUFFER (obuffer); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1731 |
3204
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
1732 /* If the overlay has changed buffers, do a thorough redisplay. */ |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
1733 if (!EQ (buffer, obuffer)) |
3204
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
1734 windows_or_buffers_changed = 1; |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
1735 else |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
1736 /* Redisplay the area the overlay has just left, or just enclosed. */ |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
1737 { |
4416
9657ef911049
(Fmove_overlay): Avoid initializer for Lisp_Object vars.
Richard M. Stallman <rms@gnu.org>
parents:
4226
diff
changeset
|
1738 Lisp_Object o_beg; |
9657ef911049
(Fmove_overlay): Avoid initializer for Lisp_Object vars.
Richard M. Stallman <rms@gnu.org>
parents:
4226
diff
changeset
|
1739 Lisp_Object o_end; |
3204
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
1740 int change_beg, change_end; |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
1741 |
4416
9657ef911049
(Fmove_overlay): Avoid initializer for Lisp_Object vars.
Richard M. Stallman <rms@gnu.org>
parents:
4226
diff
changeset
|
1742 o_beg = OVERLAY_START (overlay); |
9657ef911049
(Fmove_overlay): Avoid initializer for Lisp_Object vars.
Richard M. Stallman <rms@gnu.org>
parents:
4226
diff
changeset
|
1743 o_end = OVERLAY_END (overlay); |
3204
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
1744 o_beg = OVERLAY_POSITION (o_beg); |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
1745 o_end = OVERLAY_POSITION (o_end); |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
1746 |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
1747 if (XINT (o_beg) == XINT (beg)) |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
1748 redisplay_region (b, XINT (o_end), XINT (end)); |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
1749 else if (XINT (o_end) == XINT (end)) |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
1750 redisplay_region (b, XINT (o_beg), XINT (beg)); |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
1751 else |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
1752 { |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
1753 if (XINT (beg) < XINT (o_beg)) o_beg = beg; |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
1754 if (XINT (end) > XINT (o_end)) o_end = end; |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
1755 redisplay_region (b, XINT (o_beg), XINT (o_end)); |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
1756 } |
a3007f83650c
* buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents:
3031
diff
changeset
|
1757 } |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
1758 |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
1759 if (!NILP (obuffer)) |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
1760 { |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
1761 ob->overlays_before = Fdelq (overlay, ob->overlays_before); |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
1762 ob->overlays_after = Fdelq (overlay, ob->overlays_after); |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
1763 } |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1764 |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1765 Fset_marker (OVERLAY_START (overlay), beg, buffer); |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1766 Fset_marker (OVERLAY_END (overlay), end, buffer); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1767 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1768 /* Put the overlay on the wrong list. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1769 end = OVERLAY_END (overlay); |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1770 if (OVERLAY_POSITION (end) < XINT (b->overlay_center)) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1771 b->overlays_after = Fcons (overlay, b->overlays_after); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1772 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1773 b->overlays_before = Fcons (overlay, b->overlays_before); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1774 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1775 /* This puts it in the right list, and in the right order. */ |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1776 recenter_overlay_lists (b, XINT (b->overlay_center)); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1777 |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
1778 return unbind_to (count, overlay); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1779 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1780 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1781 DEFUN ("delete-overlay", Fdelete_overlay, Sdelete_overlay, 1, 1, 0, |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1782 "Delete the overlay OVERLAY from its buffer.") |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1783 (overlay) |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1784 Lisp_Object overlay; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1785 { |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
1786 Lisp_Object buffer; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1787 struct buffer *b; |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
1788 int count = specpdl_ptr - specpdl; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1789 |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1790 CHECK_OVERLAY (overlay, 0); |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1791 |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
1792 buffer = Fmarker_buffer (OVERLAY_START (overlay)); |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
1793 if (NILP (buffer)) |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
1794 return Qnil; |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
1795 |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
1796 b = XBUFFER (buffer); |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
1797 |
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
1798 specbind (Qinhibit_quit, Qt); |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1799 |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1800 b->overlays_before = Fdelq (overlay, b->overlays_before); |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1801 b->overlays_after = Fdelq (overlay, b->overlays_after); |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1802 |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
1803 redisplay_region (b, |
4852
ef44bf38f456
(Fdelete_overlay, Foverlay_put): Use marker_position,
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1804 marker_position (OVERLAY_START (overlay)), |
ef44bf38f456
(Fdelete_overlay, Foverlay_put): Use marker_position,
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1805 marker_position (OVERLAY_END (overlay))); |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
1806 |
2791
4f234fbfb02c
* buffer.c (Fmove_overlay): If the overlay is in no buffer and the
Jim Blandy <jimb@redhat.com>
parents:
2787
diff
changeset
|
1807 Fset_marker (OVERLAY_START (overlay), Qnil, Qnil); |
4f234fbfb02c
* buffer.c (Fmove_overlay): If the overlay is in no buffer and the
Jim Blandy <jimb@redhat.com>
parents:
2787
diff
changeset
|
1808 Fset_marker (OVERLAY_END (overlay), Qnil, Qnil); |
4f234fbfb02c
* buffer.c (Fmove_overlay): If the overlay is in no buffer and the
Jim Blandy <jimb@redhat.com>
parents:
2787
diff
changeset
|
1809 |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
1810 return unbind_to (count, Qnil); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1811 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1812 |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1813 /* Overlay dissection functions. */ |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1814 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1815 DEFUN ("overlay-start", Foverlay_start, Soverlay_start, 1, 1, 0, |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1816 "Return the position at which OVERLAY starts.") |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1817 (overlay) |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1818 Lisp_Object overlay; |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1819 { |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1820 CHECK_OVERLAY (overlay, 0); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1821 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1822 return (Fmarker_position (OVERLAY_START (overlay))); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1823 } |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1824 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1825 DEFUN ("overlay-end", Foverlay_end, Soverlay_end, 1, 1, 0, |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1826 "Return the position at which OVERLAY ends.") |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1827 (overlay) |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1828 Lisp_Object overlay; |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1829 { |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1830 CHECK_OVERLAY (overlay, 0); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1831 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1832 return (Fmarker_position (OVERLAY_END (overlay))); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1833 } |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1834 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1835 DEFUN ("overlay-buffer", Foverlay_buffer, Soverlay_buffer, 1, 1, 0, |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1836 "Return the buffer OVERLAY belongs to.") |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1837 (overlay) |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1838 Lisp_Object overlay; |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1839 { |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1840 CHECK_OVERLAY (overlay, 0); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1841 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1842 return Fmarker_buffer (OVERLAY_START (overlay)); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1843 } |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1844 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1845 DEFUN ("overlay-properties", Foverlay_properties, Soverlay_properties, 1, 1, 0, |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1846 "Return a list of the properties on OVERLAY.\n\ |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1847 This is a copy of OVERLAY's plist; modifying its conses has no effect on\n\ |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1848 OVERLAY.") |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1849 (overlay) |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1850 Lisp_Object overlay; |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1851 { |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1852 CHECK_OVERLAY (overlay, 0); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1853 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1854 return Fcopy_sequence (Fcdr_safe (XCONS (overlay)->cdr)); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1855 } |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1856 |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
1857 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1858 DEFUN ("overlays-at", Foverlays_at, Soverlays_at, 1, 1, 0, |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3533
diff
changeset
|
1859 "Return a list of the overlays that contain position POS.") |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1860 (pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1861 Lisp_Object pos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1862 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1863 int noverlays; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1864 int endpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1865 Lisp_Object *overlay_vec; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1866 int len; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1867 Lisp_Object result; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1868 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1869 CHECK_NUMBER_COERCE_MARKER (pos, 0); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1870 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1871 len = 10; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1872 overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object)); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1873 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1874 /* Put all the overlays we want in a vector in overlay_vec. |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1875 Store the length in len. */ |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1876 noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len, &endpos); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1877 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1878 /* Make a list of them all. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1879 result = Flist (noverlays, overlay_vec); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1880 |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
1881 xfree (overlay_vec); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1882 return result; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1883 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1884 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1885 DEFUN ("next-overlay-change", Fnext_overlay_change, Snext_overlay_change, |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1886 1, 1, 0, |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1887 "Return the next position after POS where an overlay starts or ends.") |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1888 (pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1889 Lisp_Object pos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1890 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1891 int noverlays; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1892 int endpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1893 Lisp_Object *overlay_vec; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1894 int len; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1895 Lisp_Object result; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1896 int i; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1897 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1898 CHECK_NUMBER_COERCE_MARKER (pos, 0); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1899 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1900 len = 10; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1901 overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object)); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1902 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1903 /* Put all the overlays we want in a vector in overlay_vec. |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1904 Store the length in len. |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1905 endpos gets the position where the next overlay starts. */ |
2839
8c43cc245dd2
(overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents:
2791
diff
changeset
|
1906 noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len, &endpos); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1907 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1908 /* If any of these overlays ends before endpos, |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1909 use its ending point instead. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1910 for (i = 0; i < noverlays; i++) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1911 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1912 Lisp_Object oend; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1913 int oendpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1914 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1915 oend = OVERLAY_END (overlay_vec[i]); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1916 oendpos = OVERLAY_POSITION (oend); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1917 if (oendpos < endpos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1918 endpos = oendpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1919 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1920 |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
1921 xfree (overlay_vec); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1922 return make_number (endpos); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1923 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1924 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1925 /* These functions are for debugging overlays. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1926 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1927 DEFUN ("overlay-lists", Foverlay_lists, Soverlay_lists, 0, 0, 0, |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1928 "Return a pair of lists giving all the overlays of the current buffer.\n\ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1929 The car has all the overlays before the overlay center;\n\ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1930 the cdr has all the overlays before the overlay center.\n\ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1931 Recentering overlays moves overlays between these lists.\n\ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1932 The lists you get are copies, so that changing them has no effect.\n\ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1933 However, the overlays you get are the real objects that the buffer uses.") |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1934 () |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1935 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1936 Lisp_Object before, after; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1937 before = current_buffer->overlays_before; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1938 if (CONSP (before)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1939 before = Fcopy_sequence (before); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1940 after = current_buffer->overlays_after; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1941 if (CONSP (after)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1942 after = Fcopy_sequence (after); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1943 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1944 return Fcons (before, after); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1945 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1946 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1947 DEFUN ("overlay-recenter", Foverlay_recenter, Soverlay_recenter, 1, 1, 0, |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1948 "Recenter the overlays of the current buffer around position POS.") |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1949 (pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1950 Lisp_Object pos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1951 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1952 CHECK_NUMBER_COERCE_MARKER (pos, 0); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1953 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1954 recenter_overlay_lists (current_buffer, XINT (pos)); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1955 return Qnil; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1956 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1957 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1958 DEFUN ("overlay-get", Foverlay_get, Soverlay_get, 2, 2, 0, |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1959 "Get the property of overlay OVERLAY with property name NAME.") |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1960 (overlay, prop) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1961 Lisp_Object overlay, prop; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1962 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1963 Lisp_Object plist; |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1964 |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1965 CHECK_OVERLAY (overlay, 0); |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1966 |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1967 for (plist = Fcdr_safe (XCONS (overlay)->cdr); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1968 CONSP (plist) && CONSP (XCONS (plist)->cdr); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1969 plist = XCONS (XCONS (plist)->cdr)->cdr) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1970 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1971 if (EQ (XCONS (plist)->car, prop)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1972 return XCONS (XCONS (plist)->cdr)->car; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1973 } |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1974 |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1975 return Qnil; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1976 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1977 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1978 DEFUN ("overlay-put", Foverlay_put, Soverlay_put, 3, 3, 0, |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1979 "Set one property of overlay OVERLAY: give property PROP value VALUE.") |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1980 (overlay, prop, value) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1981 Lisp_Object overlay, prop, value; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1982 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1983 Lisp_Object plist, tail; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1984 |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1985 CHECK_OVERLAY (overlay, 0); |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
1986 |
5043
eca469f14d11
(Foverlay_put): Don't call redisplay_region if overlay has no buffer.
Richard M. Stallman <rms@gnu.org>
parents:
4942
diff
changeset
|
1987 tail = Fmarker_buffer (OVERLAY_START (overlay)); |
eca469f14d11
(Foverlay_put): Don't call redisplay_region if overlay has no buffer.
Richard M. Stallman <rms@gnu.org>
parents:
4942
diff
changeset
|
1988 if (! NILP (tail)) |
eca469f14d11
(Foverlay_put): Don't call redisplay_region if overlay has no buffer.
Richard M. Stallman <rms@gnu.org>
parents:
4942
diff
changeset
|
1989 redisplay_region (XMARKER (OVERLAY_START (overlay))->buffer, |
eca469f14d11
(Foverlay_put): Don't call redisplay_region if overlay has no buffer.
Richard M. Stallman <rms@gnu.org>
parents:
4942
diff
changeset
|
1990 marker_position (OVERLAY_START (overlay)), |
eca469f14d11
(Foverlay_put): Don't call redisplay_region if overlay has no buffer.
Richard M. Stallman <rms@gnu.org>
parents:
4942
diff
changeset
|
1991 marker_position (OVERLAY_END (overlay))); |
2722
16db9d1af886
Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents:
2645
diff
changeset
|
1992 |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
1993 plist = Fcdr_safe (XCONS (overlay)->cdr); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1994 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1995 for (tail = plist; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1996 CONSP (tail) && CONSP (XCONS (tail)->cdr); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1997 tail = XCONS (XCONS (tail)->cdr)->cdr) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1998 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1999 if (EQ (XCONS (tail)->car, prop)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2000 return XCONS (XCONS (tail)->cdr)->car = value; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2001 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2002 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2003 if (! CONSP (XCONS (overlay)->cdr)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2004 XCONS (overlay)->cdr = Fcons (Qnil, Qnil); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2005 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2006 XCONS (XCONS (overlay)->cdr)->cdr |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2007 = Fcons (prop, Fcons (value, plist)); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2008 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2009 return value; |
333 | 2010 } |
2011 | |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2012 /* Run the modification-hooks of overlays that include |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2013 any part of the text in START to END. |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2014 Run the insert-before-hooks of overlay starting at END, |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2015 and the insert-after-hooks of overlay ending at START. */ |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2016 |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2017 void |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2018 verify_overlay_modification (start, end) |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2019 Lisp_Object start, end; |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2020 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2021 Lisp_Object prop, overlay, tail; |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2022 int insertion = EQ (start, end); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2023 |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2024 for (tail = current_buffer->overlays_before; |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2025 CONSP (tail); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2026 tail = XCONS (tail)->cdr) |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2027 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2028 int startpos, endpos; |
4416
9657ef911049
(Fmove_overlay): Avoid initializer for Lisp_Object vars.
Richard M. Stallman <rms@gnu.org>
parents:
4226
diff
changeset
|
2029 Lisp_Object ostart, oend; |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2030 |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2031 overlay = XCONS (tail)->car; |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2032 |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2033 ostart = OVERLAY_START (overlay); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2034 oend = OVERLAY_END (overlay); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2035 endpos = OVERLAY_POSITION (oend); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2036 if (XFASTINT (start) > endpos) |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2037 break; |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2038 startpos = OVERLAY_POSITION (ostart); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2039 if (XFASTINT (end) == startpos && insertion) |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2040 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2041 prop = Foverlay_get (overlay, Qinsert_in_front_hooks); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2042 call_overlay_mod_hooks (prop, overlay, start, end); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2043 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2044 if (XFASTINT (start) == endpos && insertion) |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2045 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2046 prop = Foverlay_get (overlay, Qinsert_behind_hooks); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2047 call_overlay_mod_hooks (prop, overlay, start, end); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2048 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2049 if (insertion |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2050 ? (XFASTINT (start) > startpos && XFASTINT (end) < endpos) |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2051 : (XFASTINT (start) >= startpos && XFASTINT (end) <= endpos)) |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2052 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2053 prop = Foverlay_get (overlay, Qmodification_hooks); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2054 call_overlay_mod_hooks (prop, overlay, start, end); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2055 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2056 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2057 |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2058 for (tail = current_buffer->overlays_after; |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2059 CONSP (tail); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2060 tail = XCONS (tail)->cdr) |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2061 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2062 int startpos, endpos; |
4416
9657ef911049
(Fmove_overlay): Avoid initializer for Lisp_Object vars.
Richard M. Stallman <rms@gnu.org>
parents:
4226
diff
changeset
|
2063 Lisp_Object ostart, oend; |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2064 |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2065 overlay = XCONS (tail)->car; |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2066 |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2067 ostart = OVERLAY_START (overlay); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2068 oend = OVERLAY_END (overlay); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2069 startpos = OVERLAY_POSITION (ostart); |
4574
503af6aa135b
(verify_overlay_modification): initialize endpos.
Richard M. Stallman <rms@gnu.org>
parents:
4416
diff
changeset
|
2070 endpos = OVERLAY_POSITION (oend); |
4077
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2071 if (XFASTINT (end) < startpos) |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2072 break; |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2073 if (XFASTINT (end) == startpos && insertion) |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2074 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2075 prop = Foverlay_get (overlay, Qinsert_in_front_hooks); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2076 call_overlay_mod_hooks (prop, overlay, start, end); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2077 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2078 if (XFASTINT (start) == endpos && insertion) |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2079 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2080 prop = Foverlay_get (overlay, Qinsert_behind_hooks); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2081 call_overlay_mod_hooks (prop, overlay, start, end); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2082 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2083 if (insertion |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2084 ? (XFASTINT (start) > startpos && XFASTINT (end) < endpos) |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2085 : (XFASTINT (start) >= startpos && XFASTINT (end) <= endpos)) |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2086 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2087 prop = Foverlay_get (overlay, Qmodification_hooks); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2088 call_overlay_mod_hooks (prop, overlay, start, end); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2089 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2090 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2091 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2092 |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2093 static void |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2094 call_overlay_mod_hooks (list, overlay, start, end) |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2095 Lisp_Object list, overlay, start, end; |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2096 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2097 struct gcpro gcpro1; |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2098 GCPRO1 (list); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2099 while (!NILP (list)) |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2100 { |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2101 call3 (Fcar (list), overlay, start, end); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2102 list = Fcdr (list); |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2103 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2104 UNGCPRO; |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2105 } |
a860278e3ab3
(verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3884
diff
changeset
|
2106 |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2107 /* Somebody has tried to store NEWVAL into the buffer-local slot with |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2108 offset XUINT (valcontents), and NEWVAL has an unacceptable type. */ |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2109 void |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2110 buffer_slot_type_mismatch (valcontents, newval) |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2111 Lisp_Object valcontents, newval; |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2112 { |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2113 unsigned int offset = XUINT (valcontents); |
1909
ea6c75bc0d38
* buffer.c (Fswitch_to_buffer): Pass the correct number of
Jim Blandy <jimb@redhat.com>
parents:
1876
diff
changeset
|
2114 unsigned char *symbol_name = |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2115 (XSYMBOL (*(Lisp_Object *)(offset + (char *)&buffer_local_symbols)) |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2116 ->name->data); |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2117 char *type_name; |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2118 |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2119 switch (XINT (*(Lisp_Object *)(offset + (char *)&buffer_local_types))) |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2120 { |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2121 case Lisp_Int: type_name = "integers"; break; |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2122 case Lisp_String: type_name = "strings"; break; |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2123 case Lisp_Marker: type_name = "markers"; break; |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2124 case Lisp_Symbol: type_name = "symbols"; break; |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2125 case Lisp_Cons: type_name = "lists"; break; |
1909
ea6c75bc0d38
* buffer.c (Fswitch_to_buffer): Pass the correct number of
Jim Blandy <jimb@redhat.com>
parents:
1876
diff
changeset
|
2126 case Lisp_Vector: type_name = "vectors"; break; |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2127 default: |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2128 abort (); |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2129 } |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2130 |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2131 error ("only %s should be stored in the buffer-local variable %s", |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2132 type_name, symbol_name); |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2133 } |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2134 |
333 | 2135 init_buffer_once () |
2136 { | |
2137 register Lisp_Object tem; | |
2138 | |
2139 /* Make sure all markable slots in buffer_defaults | |
2140 are initialized reasonably, so mark_buffer won't choke. */ | |
2141 reset_buffer (&buffer_defaults); | |
2142 reset_buffer (&buffer_local_symbols); | |
2143 XSET (Vbuffer_defaults, Lisp_Buffer, &buffer_defaults); | |
2144 XSET (Vbuffer_local_symbols, Lisp_Buffer, &buffer_local_symbols); | |
2145 | |
2146 /* Set up the default values of various buffer slots. */ | |
2147 /* Must do these before making the first buffer! */ | |
2148 | |
2149 /* real setup is done in loaddefs.el */ | |
2150 buffer_defaults.mode_line_format = build_string ("%-"); | |
2151 buffer_defaults.abbrev_mode = Qnil; | |
2152 buffer_defaults.overwrite_mode = Qnil; | |
2153 buffer_defaults.case_fold_search = Qt; | |
2154 buffer_defaults.auto_fill_function = Qnil; | |
2155 buffer_defaults.selective_display = Qnil; | |
2156 #ifndef old | |
2157 buffer_defaults.selective_display_ellipses = Qt; | |
2158 #endif | |
2159 buffer_defaults.abbrev_table = Qnil; | |
2160 buffer_defaults.display_table = Qnil; | |
2161 buffer_defaults.undo_list = Qnil; | |
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
2162 buffer_defaults.mark_active = Qnil; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2163 buffer_defaults.overlays_before = Qnil; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2164 buffer_defaults.overlays_after = Qnil; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2165 XFASTINT (buffer_defaults.overlay_center) = 1; |
333 | 2166 |
2167 XFASTINT (buffer_defaults.tab_width) = 8; | |
2168 buffer_defaults.truncate_lines = Qnil; | |
2169 buffer_defaults.ctl_arrow = Qt; | |
2170 | |
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
2171 #ifdef MSDOS |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
2172 buffer_defaults.buffer_file_type = 0; /* TEXT */ |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
2173 #endif |
333 | 2174 XFASTINT (buffer_defaults.fill_column) = 70; |
2175 XFASTINT (buffer_defaults.left_margin) = 0; | |
2176 | |
2177 /* Assign the local-flags to the slots that have default values. | |
2178 The local flag is a bit that is used in the buffer | |
2179 to say that it has its own local value for the slot. | |
2180 The local flag bits are in the local_var_flags slot of the buffer. */ | |
2181 | |
2182 /* Nothing can work if this isn't true */ | |
2183 if (sizeof (int) != sizeof (Lisp_Object)) abort (); | |
2184 | |
2185 /* 0 means not a lisp var, -1 means always local, else mask */ | |
2186 bzero (&buffer_local_flags, sizeof buffer_local_flags); | |
2187 XFASTINT (buffer_local_flags.filename) = -1; | |
2188 XFASTINT (buffer_local_flags.directory) = -1; | |
2189 XFASTINT (buffer_local_flags.backed_up) = -1; | |
2190 XFASTINT (buffer_local_flags.save_length) = -1; | |
2191 XFASTINT (buffer_local_flags.auto_save_file_name) = -1; | |
2192 XFASTINT (buffer_local_flags.read_only) = -1; | |
2193 XFASTINT (buffer_local_flags.major_mode) = -1; | |
2194 XFASTINT (buffer_local_flags.mode_name) = -1; | |
2195 XFASTINT (buffer_local_flags.undo_list) = -1; | |
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
2196 XFASTINT (buffer_local_flags.mark_active) = -1; |
333 | 2197 |
2198 XFASTINT (buffer_local_flags.mode_line_format) = 1; | |
2199 XFASTINT (buffer_local_flags.abbrev_mode) = 2; | |
2200 XFASTINT (buffer_local_flags.overwrite_mode) = 4; | |
2201 XFASTINT (buffer_local_flags.case_fold_search) = 8; | |
2202 XFASTINT (buffer_local_flags.auto_fill_function) = 0x10; | |
2203 XFASTINT (buffer_local_flags.selective_display) = 0x20; | |
2204 #ifndef old | |
2205 XFASTINT (buffer_local_flags.selective_display_ellipses) = 0x40; | |
2206 #endif | |
2207 XFASTINT (buffer_local_flags.tab_width) = 0x80; | |
2208 XFASTINT (buffer_local_flags.truncate_lines) = 0x100; | |
2209 XFASTINT (buffer_local_flags.ctl_arrow) = 0x200; | |
2210 XFASTINT (buffer_local_flags.fill_column) = 0x400; | |
2211 XFASTINT (buffer_local_flags.left_margin) = 0x800; | |
2212 XFASTINT (buffer_local_flags.abbrev_table) = 0x1000; | |
2213 XFASTINT (buffer_local_flags.display_table) = 0x2000; | |
2214 XFASTINT (buffer_local_flags.syntax_table) = 0x8000; | |
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
2215 #ifdef MSDOS |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
2216 XFASTINT (buffer_local_flags.buffer_file_type) = 0x4000; |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
2217 #endif |
333 | 2218 |
2219 Vbuffer_alist = Qnil; | |
2220 current_buffer = 0; | |
2221 all_buffers = 0; | |
2222 | |
2223 QSFundamental = build_string ("Fundamental"); | |
2224 | |
2225 Qfundamental_mode = intern ("fundamental-mode"); | |
2226 buffer_defaults.major_mode = Qfundamental_mode; | |
2227 | |
2228 Qmode_class = intern ("mode-class"); | |
2229 | |
2230 Qprotected_field = intern ("protected-field"); | |
2231 | |
2232 Qpermanent_local = intern ("permanent-local"); | |
2233 | |
2234 Qkill_buffer_hook = intern ("kill-buffer-hook"); | |
2235 | |
2236 Vprin1_to_string_buffer = Fget_buffer_create (build_string (" prin1")); | |
2237 /* super-magic invisible buffer */ | |
2238 Vbuffer_alist = Qnil; | |
2239 | |
648 | 2240 Fset_buffer (Fget_buffer_create (build_string ("*scratch*"))); |
333 | 2241 } |
2242 | |
2243 init_buffer () | |
2244 { | |
2245 char buf[MAXPATHLEN+1]; | |
1563
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
2246 char *pwd; |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
2247 struct stat dotstat, pwdstat; |
3463
aa78c7babb8e
(init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
3329
diff
changeset
|
2248 Lisp_Object temp; |
333 | 2249 |
2250 Fset_buffer (Fget_buffer_create (build_string ("*scratch*"))); | |
1563
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
2251 |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
2252 /* If PWD is accurate, use it instead of calling getwd. This is faster |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
2253 when PWD is right, and may avoid a fatal error. */ |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
2254 if ((pwd = getenv ("PWD")) != 0 && *pwd == '/' |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
2255 && stat (pwd, &pwdstat) == 0 |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
2256 && stat (".", &dotstat) == 0 |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
2257 && dotstat.st_ino == pwdstat.st_ino |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
2258 && dotstat.st_dev == pwdstat.st_dev |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
2259 && strlen (pwd) < MAXPATHLEN) |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
2260 strcpy (buf, pwd); |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
2261 else if (getwd (buf) == 0) |
333 | 2262 fatal ("`getwd' failed: %s.\n", buf); |
2263 | |
2264 #ifndef VMS | |
2265 /* Maybe this should really use some standard subroutine | |
2266 whose definition is filename syntax dependent. */ | |
2267 if (buf[strlen (buf) - 1] != '/') | |
2268 strcat (buf, "/"); | |
2269 #endif /* not VMS */ | |
2270 current_buffer->directory = build_string (buf); | |
3463
aa78c7babb8e
(init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
3329
diff
changeset
|
2271 |
aa78c7babb8e
(init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
3329
diff
changeset
|
2272 temp = get_minibuffer (0); |
aa78c7babb8e
(init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents:
3329
diff
changeset
|
2273 XBUFFER (temp)->directory = current_buffer->directory; |
333 | 2274 } |
2275 | |
2276 /* initialize the buffer routines */ | |
2277 syms_of_buffer () | |
2278 { | |
2060
7eea4dfc5133
(syms_of_buffer): Make erase-buffer a disabled command.
Roland McGrath <roland@gnu.org>
parents:
2043
diff
changeset
|
2279 extern Lisp_Object Qdisabled; |
7eea4dfc5133
(syms_of_buffer): Make erase-buffer a disabled command.
Roland McGrath <roland@gnu.org>
parents:
2043
diff
changeset
|
2280 |
333 | 2281 staticpro (&Vbuffer_defaults); |
2282 staticpro (&Vbuffer_local_symbols); | |
2283 staticpro (&Qfundamental_mode); | |
2284 staticpro (&Qmode_class); | |
2285 staticpro (&QSFundamental); | |
2286 staticpro (&Vbuffer_alist); | |
2287 staticpro (&Qprotected_field); | |
2288 staticpro (&Qpermanent_local); | |
2289 staticpro (&Qkill_buffer_hook); | |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2290 staticpro (&Qoverlayp); |
4213
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
2291 staticpro (&Qmodification_hooks); |
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
2292 Qmodification_hooks = intern ("modification-hooks"); |
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
2293 staticpro (&Qinsert_in_front_hooks); |
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
2294 Qinsert_in_front_hooks = intern ("insert-in-front-hooks"); |
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
2295 staticpro (&Qinsert_behind_hooks); |
616036bb2427
(Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents:
4100
diff
changeset
|
2296 Qinsert_behind_hooks = intern ("insert-behind-hooks"); |
5433 | 2297 staticpro (&Qget_file_buffer); |
2298 Qget_file_buffer = intern ("get-file-buffer"); | |
5857
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2299 Qpriority = intern ("priority"); |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2300 staticpro (&Qpriority); |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2301 Qwindow = intern ("window"); |
03f8720af7fb
(sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents:
5703
diff
changeset
|
2302 staticpro (&Qwindow); |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2303 |
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2304 Qoverlayp = intern ("overlayp"); |
333 | 2305 |
2306 Fput (Qprotected_field, Qerror_conditions, | |
2307 Fcons (Qprotected_field, Fcons (Qerror, Qnil))); | |
2308 Fput (Qprotected_field, Qerror_message, | |
2309 build_string ("Attempt to modify a protected field")); | |
2310 | |
2311 /* All these use DEFVAR_LISP_NOPRO because the slots in | |
2312 buffer_defaults will all be marked via Vbuffer_defaults. */ | |
2313 | |
2314 DEFVAR_LISP_NOPRO ("default-mode-line-format", | |
2315 &buffer_defaults.mode_line_format, | |
2316 "Default value of `mode-line-format' for buffers that don't override it.\n\ | |
2317 This is the same as (default-value 'mode-line-format)."); | |
2318 | |
2319 DEFVAR_LISP_NOPRO ("default-abbrev-mode", | |
2320 &buffer_defaults.abbrev_mode, | |
2321 "Default value of `abbrev-mode' for buffers that do not override it.\n\ | |
2322 This is the same as (default-value 'abbrev-mode)."); | |
2323 | |
2324 DEFVAR_LISP_NOPRO ("default-ctl-arrow", | |
2325 &buffer_defaults.ctl_arrow, | |
2326 "Default value of `ctl-arrow' for buffers that do not override it.\n\ | |
2327 This is the same as (default-value 'ctl-arrow)."); | |
2328 | |
2329 DEFVAR_LISP_NOPRO ("default-truncate-lines", | |
2330 &buffer_defaults.truncate_lines, | |
2331 "Default value of `truncate-lines' for buffers that do not override it.\n\ | |
2332 This is the same as (default-value 'truncate-lines)."); | |
2333 | |
2334 DEFVAR_LISP_NOPRO ("default-fill-column", | |
2335 &buffer_defaults.fill_column, | |
2336 "Default value of `fill-column' for buffers that do not override it.\n\ | |
2337 This is the same as (default-value 'fill-column)."); | |
2338 | |
2339 DEFVAR_LISP_NOPRO ("default-left-margin", | |
2340 &buffer_defaults.left_margin, | |
2341 "Default value of `left-margin' for buffers that do not override it.\n\ | |
2342 This is the same as (default-value 'left-margin)."); | |
2343 | |
2344 DEFVAR_LISP_NOPRO ("default-tab-width", | |
2345 &buffer_defaults.tab_width, | |
2346 "Default value of `tab-width' for buffers that do not override it.\n\ | |
2347 This is the same as (default-value 'tab-width)."); | |
2348 | |
2349 DEFVAR_LISP_NOPRO ("default-case-fold-search", | |
2350 &buffer_defaults.case_fold_search, | |
2351 "Default value of `case-fold-search' for buffers that don't override it.\n\ | |
2352 This is the same as (default-value 'case-fold-search)."); | |
2353 | |
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
2354 #ifdef MSDOS |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
2355 DEFVAR_LISP_NOPRO ("default-buffer-file-type", |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
2356 &buffer_defaults.buffer_file_type, |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
2357 "Default file type for buffers that do not override it.\n\ |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
2358 This is the same as (default-value 'buffer-file-type).\n\ |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
2359 The file type is nil for text, t for binary."); |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
2360 #endif |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
2361 |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2362 DEFVAR_PER_BUFFER ("mode-line-format", ¤t_buffer->mode_line_format, |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2363 Qnil, 0); |
333 | 2364 |
2365 /* This doc string is too long for cpp; cpp dies if it isn't in a comment. | |
2366 But make-docfile finds it! | |
2367 DEFVAR_PER_BUFFER ("mode-line-format", ¤t_buffer->mode_line_format, | |
1985
666e3f26a8d6
* buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1953
diff
changeset
|
2368 Qnil, |
333 | 2369 "Template for displaying mode line for current buffer.\n\ |
2370 Each buffer has its own value of this variable.\n\ | |
2371 Value may be a string, a symbol or a list or cons cell.\n\ | |
2372 For a symbol, its value is used (but it is ignored if t or nil).\n\ | |
2373 A string appearing directly as the value of a symbol is processed verbatim\n\ | |
2374 in that the %-constructs below are not recognized.\n\ | |
2375 For a list whose car is a symbol, the symbol's value is taken,\n\ | |
2376 and if that is non-nil, the cadr of the list is processed recursively.\n\ | |
2377 Otherwise, the caddr of the list (if there is one) is processed.\n\ | |
2378 For a list whose car is a string or list, each element is processed\n\ | |
2379 recursively and the results are effectively concatenated.\n\ | |
2380 For a list whose car is an integer, the cdr of the list is processed\n\ | |
2381 and padded (if the number is positive) or truncated (if negative)\n\ | |
2382 to the width specified by that number.\n\ | |
2383 A string is printed verbatim in the mode line except for %-constructs:\n\ | |
2384 (%-constructs are allowed when the string is the entire mode-line-format\n\ | |
2385 or when it is found in a cons-cell or a list)\n\ | |
2386 %b -- print buffer name. %f -- print visited file name.\n\ | |
2387 %* -- print *, % or hyphen. %m -- print value of mode-name (obsolete).\n\ | |
2578
f694fc6cdd33
(Qmode-line-format): Describe %l in the doc string.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2508
diff
changeset
|
2388 %s -- print process status. %l -- print the current line number.\n\ |
5904
7f95b8e1ec44
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5873
diff
changeset
|
2389 %p -- print percent of buffer above top of window, or Top, Bot or All.\n\ |
7f95b8e1ec44
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5873
diff
changeset
|
2390 %p -- print percent of buffer above bottom of window, perhaps plus Top,\n\ |
7f95b8e1ec44
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5873
diff
changeset
|
2391 or print Bottom or All.\n\ |
333 | 2392 %n -- print Narrow if appropriate.\n\ |
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
2393 %t -- print T if files is text, B if binary.\n\ |
333 | 2394 %[ -- print one [ for each recursive editing level. %] similar.\n\ |
2395 %% -- print %. %- -- print infinitely many dashes.\n\ | |
2396 Decimal digits after the % specify field width to which to pad."); | |
2397 */ | |
2398 | |
2399 DEFVAR_LISP_NOPRO ("default-major-mode", &buffer_defaults.major_mode, | |
2400 "*Major mode for new buffers. Defaults to `fundamental-mode'.\n\ | |
2401 nil here means use current buffer's major mode."); | |
2402 | |
2403 DEFVAR_PER_BUFFER ("major-mode", ¤t_buffer->major_mode, | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2404 make_number (Lisp_Symbol), |
333 | 2405 "Symbol for current buffer's major mode."); |
2406 | |
2407 DEFVAR_PER_BUFFER ("mode-name", ¤t_buffer->mode_name, | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2408 make_number (Lisp_String), |
333 | 2409 "Pretty name of current buffer's major mode (a string)."); |
2410 | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2411 DEFVAR_PER_BUFFER ("abbrev-mode", ¤t_buffer->abbrev_mode, Qnil, |
333 | 2412 "Non-nil turns on automatic expansion of abbrevs as they are inserted.\n\ |
2413 Automatically becomes buffer-local when set in any fashion."); | |
2414 | |
2415 DEFVAR_PER_BUFFER ("case-fold-search", ¤t_buffer->case_fold_search, | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2416 Qnil, |
333 | 2417 "*Non-nil if searches should ignore case.\n\ |
2418 Automatically becomes buffer-local when set in any fashion."); | |
2419 | |
2420 DEFVAR_PER_BUFFER ("fill-column", ¤t_buffer->fill_column, | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2421 make_number (Lisp_Int), |
333 | 2422 "*Column beyond which automatic line-wrapping should happen.\n\ |
2423 Automatically becomes buffer-local when set in any fashion."); | |
2424 | |
2425 DEFVAR_PER_BUFFER ("left-margin", ¤t_buffer->left_margin, | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2426 make_number (Lisp_Int), |
333 | 2427 "*Column for the default indent-line-function to indent to.\n\ |
2428 Linefeed indents to this column in Fundamental mode.\n\ | |
2429 Automatically becomes buffer-local when set in any fashion."); | |
2430 | |
2431 DEFVAR_PER_BUFFER ("tab-width", ¤t_buffer->tab_width, | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2432 make_number (Lisp_Int), |
333 | 2433 "*Distance between tab stops (for display of tab characters), in columns.\n\ |
2434 Automatically becomes buffer-local when set in any fashion."); | |
2435 | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2436 DEFVAR_PER_BUFFER ("ctl-arrow", ¤t_buffer->ctl_arrow, Qnil, |
333 | 2437 "*Non-nil means display control chars with uparrow.\n\ |
2438 Nil means use backslash and octal digits.\n\ | |
2439 Automatically becomes buffer-local when set in any fashion.\n\ | |
2440 This variable does not apply to characters whose display is specified\n\ | |
2441 in the current display table (if there is one)."); | |
2442 | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2443 DEFVAR_PER_BUFFER ("truncate-lines", ¤t_buffer->truncate_lines, Qnil, |
333 | 2444 "*Non-nil means do not display continuation lines;\n\ |
2445 give each line of text one screen line.\n\ | |
2446 Automatically becomes buffer-local when set in any fashion.\n\ | |
2447 \n\ | |
2448 Note that this is overridden by the variable\n\ | |
2449 `truncate-partial-width-windows' if that variable is non-nil\n\ | |
764 | 2450 and this buffer is not full-frame width."); |
333 | 2451 |
5502
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
2452 #ifdef MSDOS |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
2453 DEFVAR_PER_BUFFER ("buffer-file-type", ¤t_buffer->buffer_file_type, |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
2454 Qnil, |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
2455 "*If visited file is text, nil; otherwise, t."); |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
2456 #endif |
2b48fd9bc80e
[MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents:
5433
diff
changeset
|
2457 |
333 | 2458 DEFVAR_PER_BUFFER ("default-directory", ¤t_buffer->directory, |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2459 make_number (Lisp_String), |
333 | 2460 "Name of default directory of current buffer. Should end with slash.\n\ |
2461 Each buffer has its own value of this variable."); | |
2462 | |
2463 DEFVAR_PER_BUFFER ("auto-fill-function", ¤t_buffer->auto_fill_function, | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2464 Qnil, |
333 | 2465 "Function called (if non-nil) to perform auto-fill.\n\ |
2466 It is called after self-inserting a space at a column beyond `fill-column'.\n\ | |
2467 Each buffer has its own value of this variable.\n\ | |
2468 NOTE: This variable is not an ordinary hook;\n\ | |
2469 It may not be a list of functions."); | |
2470 | |
2471 DEFVAR_PER_BUFFER ("buffer-file-name", ¤t_buffer->filename, | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2472 make_number (Lisp_String), |
333 | 2473 "Name of file visited in current buffer, or nil if not visiting a file.\n\ |
2474 Each buffer has its own value of this variable."); | |
2475 | |
2476 DEFVAR_PER_BUFFER ("buffer-auto-save-file-name", | |
1041 | 2477 ¤t_buffer->auto_save_file_name, |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2478 make_number (Lisp_String), |
333 | 2479 "Name of file for auto-saving current buffer,\n\ |
2480 or nil if buffer should not be auto-saved.\n\ | |
2481 Each buffer has its own value of this variable."); | |
2482 | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2483 DEFVAR_PER_BUFFER ("buffer-read-only", ¤t_buffer->read_only, Qnil, |
333 | 2484 "Non-nil if this buffer is read-only.\n\ |
2485 Each buffer has its own value of this variable."); | |
2486 | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2487 DEFVAR_PER_BUFFER ("buffer-backed-up", ¤t_buffer->backed_up, Qnil, |
333 | 2488 "Non-nil if this buffer's file has been backed up.\n\ |
2489 Backing up is done before the first time the file is saved.\n\ | |
2490 Each buffer has its own value of this variable."); | |
2491 | |
2492 DEFVAR_PER_BUFFER ("buffer-saved-size", ¤t_buffer->save_length, | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2493 make_number (Lisp_Int), |
333 | 2494 "Length of current buffer when last read in, saved or auto-saved.\n\ |
2495 0 initially.\n\ | |
2496 Each buffer has its own value of this variable."); | |
2497 | |
2498 DEFVAR_PER_BUFFER ("selective-display", ¤t_buffer->selective_display, | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2499 Qnil, |
333 | 2500 "Non-nil enables selective display:\n\ |
2501 Integer N as value means display only lines\n\ | |
2502 that start with less than n columns of space.\n\ | |
2503 A value of t means, after a ^M, all the rest of the line is invisible.\n\ | |
2504 Then ^M's in the file are written into files as newlines.\n\n\ | |
2505 Automatically becomes buffer-local when set in any fashion."); | |
2506 | |
2507 #ifndef old | |
2508 DEFVAR_PER_BUFFER ("selective-display-ellipses", | |
2509 ¤t_buffer->selective_display_ellipses, | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2510 Qnil, |
333 | 2511 "t means display ... on previous line when a line is invisible.\n\ |
2512 Automatically becomes buffer-local when set in any fashion."); | |
2513 #endif | |
2514 | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2515 DEFVAR_PER_BUFFER ("overwrite-mode", ¤t_buffer->overwrite_mode, Qnil, |
333 | 2516 "Non-nil if self-insertion should replace existing text.\n\ |
2214
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2060
diff
changeset
|
2517 If non-nil and not `overwrite-mode-binary', self-insertion still\n\ |
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2060
diff
changeset
|
2518 inserts at the end of a line, and inserts when point is before a tab,\n\ |
2217 | 2519 until the tab is filled in.\n\ |
2214
e5928bec8d5d
* cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents:
2060
diff
changeset
|
2520 If `overwrite-mode-binary', self-insertion replaces newlines and tabs too.\n\ |
333 | 2521 Automatically becomes buffer-local when set in any fashion."); |
2522 | |
4226
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
2523 #if 0 /* The doc string is too long for some compilers, |
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
2524 but make-docfile can find it in this comment. */ |
333 | 2525 DEFVAR_PER_BUFFER ("buffer-display-table", ¤t_buffer->display_table, |
1038
59fa7697bb14
(syms_of_buffer): Made buffer-display-table,
Richard M. Stallman <rms@gnu.org>
parents:
1001
diff
changeset
|
2526 Qnil, |
333 | 2527 "Display table that controls display of the contents of current buffer.\n\ |
2528 Automatically becomes buffer-local when set in any fashion.\n\ | |
2529 The display table is a vector created with `make-display-table'.\n\ | |
2530 The first 256 elements control how to display each possible text character.\n\ | |
2645
b0462d46afff
* buffer.c (syms_of_buffer): Doc fix for buffer-display-table.
Jim Blandy <jimb@redhat.com>
parents:
2578
diff
changeset
|
2531 Each value should be a vector of characters or nil;\n\ |
333 | 2532 nil means display the character in the default fashion.\n\ |
2645
b0462d46afff
* buffer.c (syms_of_buffer): Doc fix for buffer-display-table.
Jim Blandy <jimb@redhat.com>
parents:
2578
diff
changeset
|
2533 The remaining five elements control the display of\n\ |
b0462d46afff
* buffer.c (syms_of_buffer): Doc fix for buffer-display-table.
Jim Blandy <jimb@redhat.com>
parents:
2578
diff
changeset
|
2534 the end of a truncated screen line (element 256, a single character);\n\ |
b0462d46afff
* buffer.c (syms_of_buffer): Doc fix for buffer-display-table.
Jim Blandy <jimb@redhat.com>
parents:
2578
diff
changeset
|
2535 the end of a continued line (element 257, a single character);\n\ |
b0462d46afff
* buffer.c (syms_of_buffer): Doc fix for buffer-display-table.
Jim Blandy <jimb@redhat.com>
parents:
2578
diff
changeset
|
2536 the escape character used to display character codes in octal\n\ |
b0462d46afff
* buffer.c (syms_of_buffer): Doc fix for buffer-display-table.
Jim Blandy <jimb@redhat.com>
parents:
2578
diff
changeset
|
2537 (element 258, a single character);\n\ |
b0462d46afff
* buffer.c (syms_of_buffer): Doc fix for buffer-display-table.
Jim Blandy <jimb@redhat.com>
parents:
2578
diff
changeset
|
2538 the character used as an arrow for control characters (element 259,\n\ |
b0462d46afff
* buffer.c (syms_of_buffer): Doc fix for buffer-display-table.
Jim Blandy <jimb@redhat.com>
parents:
2578
diff
changeset
|
2539 a single character);\n\ |
b0462d46afff
* buffer.c (syms_of_buffer): Doc fix for buffer-display-table.
Jim Blandy <jimb@redhat.com>
parents:
2578
diff
changeset
|
2540 the decoration indicating the presence of invisible lines (element 260,\n\ |
b0462d46afff
* buffer.c (syms_of_buffer): Doc fix for buffer-display-table.
Jim Blandy <jimb@redhat.com>
parents:
2578
diff
changeset
|
2541 a vector of characters).\n\ |
333 | 2542 If this variable is nil, the value of `standard-display-table' is used.\n\ |
2543 Each window can have its own, overriding display table."); | |
4226
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
2544 #endif |
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
2545 DEFVAR_PER_BUFFER ("buffer-display-table", ¤t_buffer->display_table, |
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
2546 Qnil, ""); |
333 | 2547 |
2548 /*DEFVAR_LISP ("debug-check-symbol", &Vcheck_symbol, | |
2549 "Don't ask."); | |
2550 */ | |
392 | 2551 DEFVAR_LISP ("before-change-function", &Vbefore_change_function, |
333 | 2552 "Function to call before each text change.\n\ |
2553 Two arguments are passed to the function: the positions of\n\ | |
2554 the beginning and end of the range of old text to be changed.\n\ | |
2555 \(For an insertion, the beginning and end are at the same place.)\n\ | |
2556 No information is given about the length of the text after the change.\n\ | |
2557 position of the change\n\ | |
2558 \n\ | |
2559 While executing the `before-change-function', changes to buffers do not\n\ | |
2560 cause calls to any `before-change-function' or `after-change-function'."); | |
2561 Vbefore_change_function = Qnil; | |
2562 | |
2563 DEFVAR_LISP ("after-change-function", &Vafter_change_function, | |
2564 "Function to call after each text change.\n\ | |
2565 Three arguments are passed to the function: the positions of\n\ | |
2566 the beginning and end of the range of changed text,\n\ | |
2567 and the length of the pre-change text replaced by that range.\n\ | |
2568 \(For an insertion, the pre-change length is zero;\n\ | |
2569 for a deletion, that length is the number of characters deleted,\n\ | |
2570 and the post-change beginning and end are at the same place.)\n\ | |
2571 \n\ | |
2572 While executing the `after-change-function', changes to buffers do not\n\ | |
2573 cause calls to any `before-change-function' or `after-change-function'."); | |
2574 Vafter_change_function = Qnil; | |
2575 | |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
2576 DEFVAR_LISP ("first-change-hook", &Vfirst_change_hook, |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
2577 "A list of functions to call before changing a buffer which is unmodified.\n\ |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
2578 The functions are run using the `run-hooks' function."); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
2579 Vfirst_change_hook = Qnil; |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
2580 Qfirst_change_hook = intern ("first-change-hook"); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
2581 staticpro (&Qfirst_change_hook); |
333 | 2582 |
4226
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
2583 #if 0 /* The doc string is too long for some compilers, |
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
2584 but make-docfile can find it in this comment. */ |
1041 | 2585 DEFVAR_PER_BUFFER ("buffer-undo-list", ¤t_buffer->undo_list, Qnil, |
333 | 2586 "List of undo entries in current buffer.\n\ |
2587 Recent changes come first; older changes follow newer.\n\ | |
2588 \n\ | |
2589 An entry (START . END) represents an insertion which begins at\n\ | |
2590 position START and ends at position END.\n\ | |
2591 \n\ | |
2592 An entry (TEXT . POSITION) represents the deletion of the string TEXT\n\ | |
2593 from (abs POSITION). If POSITION is positive, point was at the front\n\ | |
2594 of the text being deleted; if negative, point was at the end.\n\ | |
2595 \n\ | |
2596 An entry (t HIGHWORD LOWWORD) indicates that the buffer had been\n\ | |
2597 previously unmodified. HIGHWORD and LOWWORD are the high and low\n\ | |
2598 16-bit words of the buffer's modification count at the time. If the\n\ | |
2599 modification count of the most recent save is different, this entry is\n\ | |
2600 obsolete.\n\ | |
2601 \n\ | |
1952
b0ec61f76511
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
1909
diff
changeset
|
2602 An entry (nil PROP VAL BEG . END) indicates that a text property\n\ |
b0ec61f76511
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
1909
diff
changeset
|
2603 was modified between BEG and END. PROP is the property name,\n\ |
b0ec61f76511
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
1909
diff
changeset
|
2604 and VAL is the old value.\n\ |
b0ec61f76511
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
1909
diff
changeset
|
2605 \n\ |
1985
666e3f26a8d6
* buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1953
diff
changeset
|
2606 An entry of the form POSITION indicates that point was at the buffer\n\ |
666e3f26a8d6
* buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1953
diff
changeset
|
2607 location given by the integer. Undoing an entry of this form places\n\ |
666e3f26a8d6
* buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1953
diff
changeset
|
2608 point at POSITION.\n\ |
666e3f26a8d6
* buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1953
diff
changeset
|
2609 \n\ |
333 | 2610 nil marks undo boundaries. The undo command treats the changes\n\ |
2611 between two undo boundaries as a single step to be undone.\n\ | |
2612 \n\ | |
1985
666e3f26a8d6
* buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1953
diff
changeset
|
2613 If the value of the variable is t, undo information is not recorded."); |
4226
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
2614 #endif |
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
2615 DEFVAR_PER_BUFFER ("buffer-undo-list", ¤t_buffer->undo_list, Qnil, |
7c7e33d6386d
(syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
4213
diff
changeset
|
2616 ""); |
333 | 2617 |
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
2618 DEFVAR_PER_BUFFER ("mark-active", ¤t_buffer->mark_active, Qnil, |
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
2619 "Non-nil means the mark and region are currently active in this buffer.\n\ |
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
2620 Automatically local in all buffers."); |
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
2621 |
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
2622 DEFVAR_LISP ("transient-mark-mode", &Vtransient_mark_mode, |
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
2623 "*Non-nil means deactivate the mark when the buffer contents change."); |
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
2624 Vtransient_mark_mode = Qnil; |
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
2625 |
3533
78b4e6241f85
(Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents:
3481
diff
changeset
|
2626 DEFVAR_LISP ("inhibit-read-only", &Vinhibit_read_only, |
3481
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
2627 "*Non-nil means disregard read-only status of buffers or characters.\n\ |
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
2628 If the value is t, disregard `buffer-read-only' and all `read-only'\n\ |
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
2629 text properties. If the value is a list, disregard `buffer-read-only'\n\ |
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
2630 and disregard a `read-only' text property if the property value\n\ |
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
2631 is a member of the list."); |
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
2632 Vinhibit_read_only = Qnil; |
56424e6245c2
(syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
3463
diff
changeset
|
2633 |
6051
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
2634 DEFVAR_LISP ("kill-buffer-query-functions", &Vkill_buffer_query_functions, |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
2635 "List of functions called with no args to query before killing a buffer."); |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
2636 Vkill_buffer_query_functions = Qnil; |
0b144d967f30
(Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents:
5904
diff
changeset
|
2637 |
333 | 2638 defsubr (&Sbuffer_list); |
2639 defsubr (&Sget_buffer); | |
2640 defsubr (&Sget_file_buffer); | |
2641 defsubr (&Sget_buffer_create); | |
392 | 2642 defsubr (&Sgenerate_new_buffer_name); |
333 | 2643 defsubr (&Sbuffer_name); |
2644 /*defsubr (&Sbuffer_number);*/ | |
2645 defsubr (&Sbuffer_file_name); | |
2646 defsubr (&Sbuffer_local_variables); | |
2647 defsubr (&Sbuffer_modified_p); | |
2648 defsubr (&Sset_buffer_modified_p); | |
2649 defsubr (&Sbuffer_modified_tick); | |
2650 defsubr (&Srename_buffer); | |
2651 defsubr (&Sother_buffer); | |
2652 defsubr (&Sbuffer_disable_undo); | |
2653 defsubr (&Sbuffer_enable_undo); | |
2654 defsubr (&Skill_buffer); | |
2655 defsubr (&Serase_buffer); | |
2656 defsubr (&Sswitch_to_buffer); | |
2657 defsubr (&Spop_to_buffer); | |
2658 defsubr (&Scurrent_buffer); | |
2659 defsubr (&Sset_buffer); | |
2660 defsubr (&Sbarf_if_buffer_read_only); | |
2661 defsubr (&Sbury_buffer); | |
2662 defsubr (&Slist_buffers); | |
2663 defsubr (&Skill_all_local_variables); | |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2664 |
2776
8bf3bb4c20dd
* lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents:
2722
diff
changeset
|
2665 defsubr (&Soverlayp); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2666 defsubr (&Smake_overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2667 defsubr (&Sdelete_overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2668 defsubr (&Smove_overlay); |
2787
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2669 defsubr (&Soverlay_start); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2670 defsubr (&Soverlay_end); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2671 defsubr (&Soverlay_buffer); |
995c6e665599
* buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents:
2776
diff
changeset
|
2672 defsubr (&Soverlay_properties); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2673 defsubr (&Soverlays_at); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2674 defsubr (&Snext_overlay_change); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2675 defsubr (&Soverlay_recenter); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2676 defsubr (&Soverlay_lists); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2677 defsubr (&Soverlay_get); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2678 defsubr (&Soverlay_put); |
333 | 2679 } |
2680 | |
2681 keys_of_buffer () | |
2682 { | |
2683 initial_define_key (control_x_map, 'b', "switch-to-buffer"); | |
2684 initial_define_key (control_x_map, 'k', "kill-buffer"); | |
2685 initial_define_key (control_x_map, Ctl ('B'), "list-buffers"); | |
5570
2c5f3537a1cc
(syms_of_buffer): Don't do (put 'erase-buffer 'disabled t) here.
Roland McGrath <roland@gnu.org>
parents:
5502
diff
changeset
|
2686 |
2c5f3537a1cc
(syms_of_buffer): Don't do (put 'erase-buffer 'disabled t) here.
Roland McGrath <roland@gnu.org>
parents:
5502
diff
changeset
|
2687 /* This must not be in syms_of_buffer, because Qdisabled is not |
2c5f3537a1cc
(syms_of_buffer): Don't do (put 'erase-buffer 'disabled t) here.
Roland McGrath <roland@gnu.org>
parents:
5502
diff
changeset
|
2688 initialized when that function gets called. */ |
2c5f3537a1cc
(syms_of_buffer): Don't do (put 'erase-buffer 'disabled t) here.
Roland McGrath <roland@gnu.org>
parents:
5502
diff
changeset
|
2689 Fput (intern ("erase-buffer"), Qdisabled, Qt); |
333 | 2690 } |