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