Mercurial > emacs
annotate src/buffer.c @ 2714:bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Fail more gracefully if we can't build bold, italic, etc,
versions of the default font.
* faces.el (make-face-bold, make-face-italic,
make-face-bold-italic, make-face-unbold, make-face-unitalic):
Implement NOERROR argument.
(x-initialize-frame-faces): Use the NOERROR argument to the
font manipulation functions to avoid errors while starting up.
Remove initialization of isearch font.
* xfaces.c (internal-x-complain-about-font): Add new frame
argument, so we can check the frame parameters to find the
default font. Callers changed.
* faces.el (x-create-frame-with-faces): Fix typo. Dyke out
code to fully qualify the modeline font; we may not be able to
do that correctly.
author | Jim Blandy <jimb@redhat.com> |
---|---|
date | Sun, 09 May 1993 23:38:29 +0000 |
parents | b0462d46afff |
children | 16db9d1af886 |
rev | line source |
---|---|
333 | 1 /* Buffer manipulation primitives for GNU Emacs. |
1953
714df59790af
(Ferase_buffer): Added interactive spec.
Roland McGrath <roland@gnu.org>
parents:
1952
diff
changeset
|
2 Copyright (C) 1985, 1986, 1987, 1988, 1989, 1992, 1993 |
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 | |
31 #include "config.h" | |
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 "syntax.h" | |
38 #include "indent.h" | |
2480 | 39 #include "blockinput.h" |
333 | 40 |
41 struct buffer *current_buffer; /* the current buffer */ | |
42 | |
43 /* First buffer in chain of all buffers (in reverse order of creation). | |
44 Threaded through ->next. */ | |
45 | |
46 struct buffer *all_buffers; | |
47 | |
48 /* This structure holds the default values of the buffer-local variables | |
49 defined with DEFVAR_PER_BUFFER, that have special slots in each buffer. | |
50 The default value occupies the same slot in this structure | |
51 as an individual buffer's value occupies in that buffer. | |
52 Setting the default value also goes through the alist of buffers | |
53 and stores into each buffer that does not say it has a local value. */ | |
54 | |
55 struct buffer buffer_defaults; | |
56 | |
57 /* A Lisp_Object pointer to the above, used for staticpro */ | |
58 | |
59 static Lisp_Object Vbuffer_defaults; | |
60 | |
61 /* This structure marks which slots in a buffer have corresponding | |
62 default values in buffer_defaults. | |
63 Each such slot has a nonzero value in this structure. | |
64 The value has only one nonzero bit. | |
65 | |
66 When a buffer has its own local value for a slot, | |
67 the bit for that slot (found in the same slot in this structure) | |
68 is turned on in the buffer's local_var_flags slot. | |
69 | |
70 If a slot in this structure is -1, then even though there may | |
71 be a DEFVAR_PER_BUFFER for the slot, there is no default value for it; | |
72 and the corresponding slot in buffer_defaults is not used. | |
73 | |
74 If a slot is -2, then there is no DEFVAR_PER_BUFFER for it, | |
75 but there is a default value which is copied into each buffer. | |
76 | |
77 If a slot in this structure is negative, then even though there may | |
78 be a DEFVAR_PER_BUFFER for the slot, there is no default value for it; | |
79 and the corresponding slot in buffer_defaults is not used. | |
80 | |
81 If a slot in this structure corresponding to a DEFVAR_PER_BUFFER is | |
82 zero, that is a bug */ | |
83 | |
84 struct buffer buffer_local_flags; | |
85 | |
86 /* This structure holds the names of symbols whose values may be | |
87 buffer-local. It is indexed and accessed in the same way as the above. */ | |
88 | |
89 struct buffer buffer_local_symbols; | |
90 /* A Lisp_Object pointer to the above, used for staticpro */ | |
91 static Lisp_Object Vbuffer_local_symbols; | |
92 | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
93 /* 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
|
94 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
|
95 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
|
96 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
|
97 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
|
98 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
|
99 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
|
100 |
333 | 101 Lisp_Object Fset_buffer (); |
392 | 102 void set_buffer_internal (); |
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 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
115 /* 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
|
116 Lisp_Object Vfirst_change_hook; |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
117 Lisp_Object Qfirst_change_hook; |
333 | 118 |
119 Lisp_Object Qfundamental_mode, Qmode_class, Qpermanent_local; | |
120 | |
121 Lisp_Object Qprotected_field; | |
122 | |
123 Lisp_Object QSFundamental; /* A string "Fundamental" */ | |
124 | |
125 Lisp_Object Qkill_buffer_hook; | |
126 | |
127 /* For debugging; temporary. See set_buffer_internal. */ | |
128 /* Lisp_Object Qlisp_mode, Vcheck_symbol; */ | |
129 | |
130 nsberror (spec) | |
131 Lisp_Object spec; | |
132 { | |
133 if (XTYPE (spec) == Lisp_String) | |
134 error ("No buffer named %s", XSTRING (spec)->data); | |
135 error ("Invalid buffer argument"); | |
136 } | |
137 | |
138 DEFUN ("buffer-list", Fbuffer_list, Sbuffer_list, 0, 0, 0, | |
139 "Return a list of all existing live buffers.") | |
140 () | |
141 { | |
142 return Fmapcar (Qcdr, Vbuffer_alist); | |
143 } | |
144 | |
145 DEFUN ("get-buffer", Fget_buffer, Sget_buffer, 1, 1, 0, | |
146 "Return the buffer named NAME (a string).\n\ | |
147 If there is no live buffer named NAME, return nil.\n\ | |
148 NAME may also be a buffer; if so, the value is that buffer.") | |
149 (name) | |
150 register Lisp_Object name; | |
151 { | |
152 if (XTYPE (name) == Lisp_Buffer) | |
153 return name; | |
154 CHECK_STRING (name, 0); | |
155 | |
156 return Fcdr (Fassoc (name, Vbuffer_alist)); | |
157 } | |
158 | |
159 DEFUN ("get-file-buffer", Fget_file_buffer, Sget_file_buffer, 1, 1, 0, | |
160 "Return the buffer visiting file FILENAME (a string).\n\ | |
161 If there is no such live buffer, return nil.") | |
162 (filename) | |
163 register Lisp_Object filename; | |
164 { | |
165 register Lisp_Object tail, buf, tem; | |
166 CHECK_STRING (filename, 0); | |
167 filename = Fexpand_file_name (filename, Qnil); | |
168 | |
169 for (tail = Vbuffer_alist; CONSP (tail); tail = XCONS (tail)->cdr) | |
170 { | |
171 buf = Fcdr (XCONS (tail)->car); | |
172 if (XTYPE (buf) != Lisp_Buffer) continue; | |
173 if (XTYPE (XBUFFER (buf)->filename) != Lisp_String) continue; | |
174 tem = Fstring_equal (XBUFFER (buf)->filename, filename); | |
485 | 175 if (!NILP (tem)) |
333 | 176 return buf; |
177 } | |
178 return Qnil; | |
179 } | |
180 | |
181 /* Incremented for each buffer created, to assign the buffer number. */ | |
182 int buffer_count; | |
183 | |
184 DEFUN ("get-buffer-create", Fget_buffer_create, Sget_buffer_create, 1, 1, 0, | |
185 "Return the buffer named NAME, or create such a buffer and return it.\n\ | |
186 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
|
187 If NAME starts with a space, the new buffer does not keep undo information.\n\ |
333 | 188 If NAME is a buffer instead of a string, then it is the value returned.\n\ |
189 The value is never nil.") | |
190 (name) | |
191 register Lisp_Object name; | |
192 { | |
193 register Lisp_Object buf, function, tem; | |
194 int count = specpdl_ptr - specpdl; | |
195 register struct buffer *b; | |
196 | |
197 buf = Fget_buffer (name); | |
485 | 198 if (!NILP (buf)) |
333 | 199 return buf; |
200 | |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
201 b = (struct buffer *) xmalloc (sizeof (struct buffer)); |
333 | 202 |
203 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
|
204 BLOCK_INPUT; |
333 | 205 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
|
206 UNBLOCK_INPUT; |
333 | 207 if (! BUF_BEG_ADDR (b)) |
208 memory_full (); | |
209 | |
210 BUF_PT (b) = 1; | |
211 BUF_GPT (b) = 1; | |
212 BUF_BEGV (b) = 1; | |
213 BUF_ZV (b) = 1; | |
214 BUF_Z (b) = 1; | |
215 BUF_MODIFF (b) = 1; | |
216 | |
217 /* Put this on the chain of all buffers including killed ones. */ | |
218 b->next = all_buffers; | |
219 all_buffers = b; | |
220 | |
221 b->mark = Fmake_marker (); | |
222 /*b->number = make_number (++buffer_count);*/ | |
223 b->name = name; | |
224 if (XSTRING (name)->data[0] != ' ') | |
225 b->undo_list = Qnil; | |
226 else | |
227 b->undo_list = Qt; | |
228 | |
229 reset_buffer (b); | |
230 | |
231 /* Put this in the alist of all live buffers. */ | |
232 XSET (buf, Lisp_Buffer, b); | |
233 Vbuffer_alist = nconc2 (Vbuffer_alist, Fcons (Fcons (name, buf), Qnil)); | |
234 | |
235 b->mark = Fmake_marker (); | |
236 b->markers = Qnil; | |
237 b->name = name; | |
238 | |
239 function = buffer_defaults.major_mode; | |
485 | 240 if (NILP (function)) |
333 | 241 { |
242 tem = Fget (current_buffer->major_mode, Qmode_class); | |
243 if (EQ (tem, Qnil)) | |
244 function = current_buffer->major_mode; | |
245 } | |
246 | |
485 | 247 if (NILP (function) || EQ (function, Qfundamental_mode)) |
333 | 248 return buf; |
249 | |
250 /* To select a nonfundamental mode, | |
251 select the buffer temporarily and then call the mode function. */ | |
252 | |
253 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
254 | |
255 Fset_buffer (buf); | |
256 call0 (function); | |
257 | |
258 return unbind_to (count, buf); | |
259 } | |
260 | |
261 /* Reinitialize everything about a buffer except its name and contents. */ | |
262 | |
263 void | |
264 reset_buffer (b) | |
265 register struct buffer *b; | |
266 { | |
267 b->filename = Qnil; | |
268 b->directory = (current_buffer) ? current_buffer->directory : Qnil; | |
269 b->modtime = 0; | |
270 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
|
271 XFASTINT (b->save_length) = 0; |
333 | 272 b->last_window_start = 1; |
273 b->backed_up = Qnil; | |
274 b->auto_save_modified = 0; | |
275 b->auto_save_file_name = Qnil; | |
276 b->read_only = Qnil; | |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
277 b->overlays_before = Qnil; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
278 b->overlays_after = Qnil; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
279 XFASTINT (b->overlay_center) = 1; |
1291
7c32612174c3
* buffer.c (reset_buffer): Do INITIALIZE_INTERVAL on the buffer's
Joseph Arceneaux <jla@gnu.org>
parents:
1281
diff
changeset
|
280 |
7c32612174c3
* buffer.c (reset_buffer): Do INITIALIZE_INTERVAL on the buffer's
Joseph Arceneaux <jla@gnu.org>
parents:
1281
diff
changeset
|
281 /* 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
|
282 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
|
283 |
333 | 284 reset_buffer_local_variables(b); |
285 } | |
286 | |
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
287 reset_buffer_local_variables (b) |
333 | 288 register struct buffer *b; |
289 { | |
290 register int offset; | |
291 | |
292 /* Reset the major mode to Fundamental, together with all the | |
293 things that depend on the major mode. | |
294 default-major-mode is handled at a higher level. | |
295 We ignore it here. */ | |
296 b->major_mode = Qfundamental_mode; | |
297 b->keymap = Qnil; | |
298 b->abbrev_table = Vfundamental_mode_abbrev_table; | |
299 b->mode_name = QSFundamental; | |
300 b->minor_modes = Qnil; | |
301 b->downcase_table = Vascii_downcase_table; | |
302 b->upcase_table = Vascii_upcase_table; | |
303 b->case_canon_table = Vascii_downcase_table; | |
304 b->case_eqv_table = Vascii_upcase_table; | |
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
305 b->mark_active = Qnil; |
333 | 306 #if 0 |
307 b->sort_table = XSTRING (Vascii_sort_table); | |
308 b->folding_sort_table = XSTRING (Vascii_folding_sort_table); | |
309 #endif /* 0 */ | |
310 | |
311 /* Reset all per-buffer variables to their defaults. */ | |
312 b->local_var_alist = Qnil; | |
313 b->local_var_flags = 0; | |
314 | |
315 /* For each slot that has a default value, | |
316 copy that into the slot. */ | |
317 | |
318 for (offset = (char *)&buffer_local_flags.name - (char *)&buffer_local_flags; | |
319 offset < sizeof (struct buffer); | |
320 offset += sizeof (Lisp_Object)) /* sizeof int == sizeof Lisp_Object */ | |
321 if (*(int *)(offset + (char *) &buffer_local_flags) > 0 | |
322 || *(int *)(offset + (char *) &buffer_local_flags) == -2) | |
323 *(Lisp_Object *)(offset + (char *)b) = | |
324 *(Lisp_Object *)(offset + (char *)&buffer_defaults); | |
325 } | |
326 | |
392 | 327 /* We split this away from generate-new-buffer, because rename-buffer |
328 and set-visited-file-name ought to be able to use this to really | |
329 rename the buffer properly. */ | |
330 | |
331 DEFUN ("generate-new-buffer-name", Fgenerate_new_buffer_name, Sgenerate_new_buffer_name, | |
333 | 332 1, 1, 0, |
392 | 333 "Return a string that is the name of no existing buffer based on NAME.\n\ |
334 If there is no live buffer named NAME, then return NAME.\n\ | |
333 | 335 Otherwise modify name by appending `<NUMBER>', incrementing NUMBER\n\ |
392 | 336 until an unused name is found, and then return that name.") |
333 | 337 (name) |
338 register Lisp_Object name; | |
339 { | |
340 register Lisp_Object gentemp, tem; | |
341 int count; | |
342 char number[10]; | |
343 | |
344 CHECK_STRING (name, 0); | |
345 | |
346 tem = Fget_buffer (name); | |
485 | 347 if (NILP (tem)) |
392 | 348 return name; |
333 | 349 |
350 count = 1; | |
351 while (1) | |
352 { | |
353 sprintf (number, "<%d>", ++count); | |
354 gentemp = concat2 (name, build_string (number)); | |
355 tem = Fget_buffer (gentemp); | |
485 | 356 if (NILP (tem)) |
392 | 357 return gentemp; |
333 | 358 } |
359 } | |
360 | |
361 | |
362 DEFUN ("buffer-name", Fbuffer_name, Sbuffer_name, 0, 1, 0, | |
363 "Return the name of BUFFER, as a string.\n\ | |
392 | 364 With no argument or nil as argument, return the name of the current buffer.") |
333 | 365 (buffer) |
366 register Lisp_Object buffer; | |
367 { | |
485 | 368 if (NILP (buffer)) |
333 | 369 return current_buffer->name; |
370 CHECK_BUFFER (buffer, 0); | |
371 return XBUFFER (buffer)->name; | |
372 } | |
373 | |
374 DEFUN ("buffer-file-name", Fbuffer_file_name, Sbuffer_file_name, 0, 1, 0, | |
375 "Return name of file BUFFER is visiting, or nil if none.\n\ | |
376 No argument or nil as argument means use the current buffer.") | |
377 (buffer) | |
378 register Lisp_Object buffer; | |
379 { | |
485 | 380 if (NILP (buffer)) |
333 | 381 return current_buffer->filename; |
382 CHECK_BUFFER (buffer, 0); | |
383 return XBUFFER (buffer)->filename; | |
384 } | |
385 | |
386 DEFUN ("buffer-local-variables", Fbuffer_local_variables, | |
387 Sbuffer_local_variables, 0, 1, 0, | |
388 "Return an alist of variables that are buffer-local in BUFFER.\n\ | |
389 Each element looks like (SYMBOL . VALUE) and describes one variable.\n\ | |
390 Note that storing new VALUEs in these elements doesn't change the variables.\n\ | |
391 No argument or nil as argument means use current buffer as BUFFER.") | |
392 (buffer) | |
393 register Lisp_Object buffer; | |
394 { | |
395 register struct buffer *buf; | |
396 register Lisp_Object val; | |
397 | |
485 | 398 if (NILP (buffer)) |
333 | 399 buf = current_buffer; |
400 else | |
401 { | |
402 CHECK_BUFFER (buffer, 0); | |
403 buf = XBUFFER (buffer); | |
404 } | |
405 | |
406 { | |
407 /* Reference each variable in the alist in our current buffer. | |
408 If inquiring about the current buffer, this gets the current values, | |
409 so store them into the alist so the alist is up to date. | |
410 If inquiring about some other buffer, this swaps out any values | |
411 for that buffer, making the alist up to date automatically. */ | |
412 register Lisp_Object tem; | |
413 for (tem = buf->local_var_alist; CONSP (tem); tem = XCONS (tem)->cdr) | |
414 { | |
415 Lisp_Object v1 = Fsymbol_value (XCONS (XCONS (tem)->car)->car); | |
416 if (buf == current_buffer) | |
417 XCONS (XCONS (tem)->car)->cdr = v1; | |
418 } | |
419 } | |
420 | |
421 /* Make a copy of the alist, to return it. */ | |
422 val = Fcopy_alist (buf->local_var_alist); | |
423 | |
424 /* Add on all the variables stored in special slots. */ | |
425 { | |
426 register int offset, mask; | |
427 | |
428 for (offset = (char *)&buffer_local_symbols.name - (char *)&buffer_local_symbols; | |
429 offset < sizeof (struct buffer); | |
430 offset += (sizeof (int))) /* sizeof int == sizeof Lisp_Object */ | |
431 { | |
432 mask = *(int *)(offset + (char *) &buffer_local_flags); | |
433 if (mask == -1 || (buf->local_var_flags & mask)) | |
434 if (XTYPE (*(Lisp_Object *)(offset + (char *)&buffer_local_symbols)) | |
435 == Lisp_Symbol) | |
436 val = Fcons (Fcons (*(Lisp_Object *)(offset + (char *)&buffer_local_symbols), | |
437 *(Lisp_Object *)(offset + (char *)buf)), | |
438 val); | |
439 } | |
440 } | |
441 return (val); | |
442 } | |
443 | |
444 | |
445 DEFUN ("buffer-modified-p", Fbuffer_modified_p, Sbuffer_modified_p, | |
446 0, 1, 0, | |
447 "Return t if BUFFER was modified since its file was last read or saved.\n\ | |
448 No argument or nil as argument means use current buffer as BUFFER.") | |
449 (buffer) | |
450 register Lisp_Object buffer; | |
451 { | |
452 register struct buffer *buf; | |
485 | 453 if (NILP (buffer)) |
333 | 454 buf = current_buffer; |
455 else | |
456 { | |
457 CHECK_BUFFER (buffer, 0); | |
458 buf = XBUFFER (buffer); | |
459 } | |
460 | |
461 return buf->save_modified < BUF_MODIFF (buf) ? Qt : Qnil; | |
462 } | |
463 | |
464 DEFUN ("set-buffer-modified-p", Fset_buffer_modified_p, Sset_buffer_modified_p, | |
465 1, 1, 0, | |
466 "Mark current buffer as modified or unmodified according to FLAG.\n\ | |
467 A non-nil FLAG means mark the buffer modified.") | |
468 (flag) | |
469 register Lisp_Object flag; | |
470 { | |
471 register int already; | |
472 register Lisp_Object fn; | |
473 | |
474 #ifdef CLASH_DETECTION | |
475 /* If buffer becoming modified, lock the file. | |
476 If buffer becoming unmodified, unlock the file. */ | |
477 | |
478 fn = current_buffer->filename; | |
485 | 479 if (!NILP (fn)) |
333 | 480 { |
481 already = current_buffer->save_modified < MODIFF; | |
485 | 482 if (!already && !NILP (flag)) |
333 | 483 lock_file (fn); |
485 | 484 else if (already && NILP (flag)) |
333 | 485 unlock_file (fn); |
486 } | |
487 #endif /* CLASH_DETECTION */ | |
488 | |
485 | 489 current_buffer->save_modified = NILP (flag) ? MODIFF : 0; |
333 | 490 update_mode_lines++; |
491 return flag; | |
492 } | |
493 | |
494 DEFUN ("buffer-modified-tick", Fbuffer_modified_tick, Sbuffer_modified_tick, | |
495 0, 1, 0, | |
496 "Return BUFFER's tick counter, incremented for each change in text.\n\ | |
497 Each buffer has a tick counter which is incremented each time the text in\n\ | |
498 that buffer is changed. It wraps around occasionally.\n\ | |
499 No argument or nil as argument means use current buffer as BUFFER.") | |
500 (buffer) | |
501 register Lisp_Object buffer; | |
502 { | |
503 register struct buffer *buf; | |
485 | 504 if (NILP (buffer)) |
333 | 505 buf = current_buffer; |
506 else | |
507 { | |
508 CHECK_BUFFER (buffer, 0); | |
509 buf = XBUFFER (buffer); | |
510 } | |
511 | |
512 return make_number (BUF_MODIFF (buf)); | |
513 } | |
514 | |
392 | 515 DEFUN ("rename-buffer", Frename_buffer, Srename_buffer, 1, 2, |
1876
0ddafa88e654
(Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
516 "sRename buffer (to new name): \nP", |
333 | 517 "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
|
518 If second arg UNIQUE is nil or omitted, it is an error if a\n\ |
392 | 519 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
|
520 If UNIQUE is non-nil, come up with a new name using\n\ |
392 | 521 `generate-new-buffer-name'.\n\ |
1876
0ddafa88e654
(Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
522 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
|
523 We return the name we actually gave the buffer.\n\ |
333 | 524 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
|
525 (name, unique) |
0ddafa88e654
(Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
526 register Lisp_Object name, unique; |
333 | 527 { |
528 register Lisp_Object tem, buf; | |
529 | |
530 CHECK_STRING (name, 0); | |
531 tem = Fget_buffer (name); | |
392 | 532 if (XBUFFER (tem) == current_buffer) |
533 return current_buffer->name; | |
485 | 534 if (!NILP (tem)) |
392 | 535 { |
1876
0ddafa88e654
(Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
536 if (!NILP (unique)) |
392 | 537 name = Fgenerate_new_buffer_name (name); |
538 else | |
539 error ("Buffer name \"%s\" is in use", XSTRING (name)->data); | |
540 } | |
333 | 541 |
542 current_buffer->name = name; | |
1707
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
543 |
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
544 /* 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
|
545 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
|
546 update_mode_lines++; |
86c951f6a444
* buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents:
1586
diff
changeset
|
547 |
333 | 548 XSET (buf, Lisp_Buffer, current_buffer); |
549 Fsetcar (Frassq (buf, Vbuffer_alist), name); | |
485 | 550 if (NILP (current_buffer->filename) && !NILP (current_buffer->auto_save_file_name)) |
333 | 551 call0 (intern ("rename-auto-save-file")); |
392 | 552 return name; |
333 | 553 } |
554 | |
1281
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
555 DEFUN ("other-buffer", Fother_buffer, Sother_buffer, 0, 2, 0, |
333 | 556 "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
|
557 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
|
558 unless optional second argument VISIBLE-OK is non-nil.\n\ |
333 | 559 If no other buffer exists, the buffer `*scratch*' is returned.\n\ |
560 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
|
561 (buffer, visible_ok) |
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
562 register Lisp_Object buffer, visible_ok; |
333 | 563 { |
564 register Lisp_Object tail, buf, notsogood, tem; | |
565 notsogood = Qnil; | |
566 | |
485 | 567 for (tail = Vbuffer_alist; !NILP (tail); tail = Fcdr (tail)) |
333 | 568 { |
569 buf = Fcdr (Fcar (tail)); | |
570 if (EQ (buf, buffer)) | |
571 continue; | |
572 if (XSTRING (XBUFFER (buf)->name)->data[0] == ' ') | |
573 continue; | |
1281
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
574 if (NILP (visible_ok)) |
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
575 tem = Fget_buffer_window (buf, Qnil); |
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
576 else |
1f6cfa3ea4cb
* buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents:
1253
diff
changeset
|
577 tem = Qnil; |
485 | 578 if (NILP (tem)) |
333 | 579 return buf; |
485 | 580 if (NILP (notsogood)) |
333 | 581 notsogood = buf; |
582 } | |
485 | 583 if (!NILP (notsogood)) |
333 | 584 return notsogood; |
585 return Fget_buffer_create (build_string ("*scratch*")); | |
586 } | |
587 | |
588 DEFUN ("buffer-disable-undo", Fbuffer_disable_undo, Sbuffer_disable_undo, 1,1, | |
589 0, | |
590 "Make BUFFER stop keeping undo information.") | |
648 | 591 (buffer) |
592 register Lisp_Object buffer; | |
333 | 593 { |
648 | 594 Lisp_Object real_buffer; |
595 | |
596 if (NILP (buffer)) | |
597 XSET (real_buffer, Lisp_Buffer, current_buffer); | |
598 else | |
599 { | |
600 real_buffer = Fget_buffer (buffer); | |
601 if (NILP (real_buffer)) | |
602 nsberror (buffer); | |
603 } | |
604 | |
605 XBUFFER (real_buffer)->undo_list = Qt; | |
606 | |
333 | 607 return Qnil; |
608 } | |
609 | |
610 DEFUN ("buffer-enable-undo", Fbuffer_enable_undo, Sbuffer_enable_undo, | |
611 0, 1, "", | |
612 "Start keeping undo information for buffer BUFFER.\n\ | |
613 No argument or nil as argument means do this for the current buffer.") | |
648 | 614 (buffer) |
615 register Lisp_Object buffer; | |
333 | 616 { |
648 | 617 Lisp_Object real_buffer; |
333 | 618 |
648 | 619 if (NILP (buffer)) |
620 XSET (real_buffer, Lisp_Buffer, current_buffer); | |
333 | 621 else |
622 { | |
648 | 623 real_buffer = Fget_buffer (buffer); |
624 if (NILP (real_buffer)) | |
625 nsberror (buffer); | |
333 | 626 } |
627 | |
648 | 628 if (EQ (XBUFFER (real_buffer)->undo_list, Qt)) |
629 XBUFFER (real_buffer)->undo_list = Qnil; | |
333 | 630 |
631 return Qnil; | |
632 } | |
633 | |
634 /* | |
635 DEFVAR_LISP ("kill-buffer-hook", no_cell, "\ | |
636 Hook to be run (by `run-hooks', which see) when a buffer is killed.\n\ | |
637 The buffer being killed will be current while the hook is running.\n\ | |
638 See `kill-buffer'." | |
639 */ | |
640 DEFUN ("kill-buffer", Fkill_buffer, Skill_buffer, 1, 1, "bKill buffer: ", | |
641 "Kill the buffer BUFFER.\n\ | |
642 The argument may be a buffer or may be the name of a buffer.\n\ | |
643 An argument of nil means kill the current buffer.\n\n\ | |
644 Value is t if the buffer is actually killed, nil if user says no.\n\n\ | |
645 The value of `kill-buffer-hook' (which may be local to that buffer),\n\ | |
646 if not void, is a list of functions to be called, with no arguments,\n\ | |
647 before the buffer is actually killed. The buffer to be killed is current\n\ | |
648 when the hook functions are called.\n\n\ | |
649 Any processes that have this buffer as the `process-buffer' are killed\n\ | |
650 with `delete-process'.") | |
651 (bufname) | |
652 Lisp_Object bufname; | |
653 { | |
654 Lisp_Object buf; | |
655 register struct buffer *b; | |
656 register Lisp_Object tem; | |
657 register struct Lisp_Marker *m; | |
658 struct gcpro gcpro1, gcpro2; | |
659 | |
485 | 660 if (NILP (bufname)) |
333 | 661 buf = Fcurrent_buffer (); |
662 else | |
663 buf = Fget_buffer (bufname); | |
485 | 664 if (NILP (buf)) |
333 | 665 nsberror (bufname); |
666 | |
667 b = XBUFFER (buf); | |
668 | |
669 /* Query if the buffer is still modified. */ | |
485 | 670 if (INTERACTIVE && !NILP (b->filename) |
333 | 671 && BUF_MODIFF (b) > b->save_modified) |
672 { | |
673 GCPRO2 (buf, bufname); | |
674 tem = do_yes_or_no_p (format1 ("Buffer %s modified; kill anyway? ", | |
675 XSTRING (b->name)->data)); | |
676 UNGCPRO; | |
485 | 677 if (NILP (tem)) |
333 | 678 return Qnil; |
679 } | |
680 | |
681 /* Run kill-buffer hook with the buffer to be killed the current buffer. */ | |
682 { | |
683 register Lisp_Object val; | |
684 int count = specpdl_ptr - specpdl; | |
685 | |
686 record_unwind_protect (save_excursion_restore, save_excursion_save ()); | |
687 set_buffer_internal (b); | |
688 call1 (Vrun_hooks, Qkill_buffer_hook); | |
689 unbind_to (count, Qnil); | |
690 } | |
691 | |
692 /* We have no more questions to ask. Verify that it is valid | |
693 to kill the buffer. This must be done after the questions | |
694 since anything can happen within do_yes_or_no_p. */ | |
695 | |
696 /* Don't kill the minibuffer now current. */ | |
697 if (EQ (buf, XWINDOW (minibuf_window)->buffer)) | |
698 return Qnil; | |
699 | |
485 | 700 if (NILP (b->name)) |
333 | 701 return Qnil; |
702 | |
703 /* Make this buffer not be current. | |
704 In the process, notice if this is the sole visible buffer | |
705 and give up if so. */ | |
706 if (b == current_buffer) | |
707 { | |
1348
f6ab9d1e1709
(Fkill_buffer): Pass 2nd arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1308
diff
changeset
|
708 tem = Fother_buffer (buf, Qnil); |
333 | 709 Fset_buffer (tem); |
710 if (b == current_buffer) | |
711 return Qnil; | |
712 } | |
713 | |
714 /* Now there is no question: we can kill the buffer. */ | |
715 | |
716 #ifdef CLASH_DETECTION | |
717 /* Unlock this buffer's file, if it is locked. */ | |
718 unlock_buffer (b); | |
719 #endif /* CLASH_DETECTION */ | |
720 | |
721 kill_buffer_processes (buf); | |
722 | |
723 tem = Vinhibit_quit; | |
724 Vinhibit_quit = Qt; | |
725 Vbuffer_alist = Fdelq (Frassq (buf, Vbuffer_alist), Vbuffer_alist); | |
726 Freplace_buffer_in_windows (buf); | |
727 Vinhibit_quit = tem; | |
728 | |
729 /* Delete any auto-save file. */ | |
730 if (XTYPE (b->auto_save_file_name) == Lisp_String) | |
731 { | |
732 Lisp_Object tem; | |
733 tem = Fsymbol_value (intern ("delete-auto-save-files")); | |
485 | 734 if (! NILP (tem)) |
333 | 735 unlink (XSTRING (b->auto_save_file_name)->data); |
736 } | |
737 | |
738 /* Unchain all markers of this buffer | |
739 and leave them pointing nowhere. */ | |
740 for (tem = b->markers; !EQ (tem, Qnil); ) | |
741 { | |
742 m = XMARKER (tem); | |
743 m->buffer = 0; | |
744 tem = m->chain; | |
745 m->chain = Qnil; | |
746 } | |
747 b->markers = Qnil; | |
748 | |
1291
7c32612174c3
* buffer.c (reset_buffer): Do INITIALIZE_INTERVAL on the buffer's
Joseph Arceneaux <jla@gnu.org>
parents:
1281
diff
changeset
|
749 /* 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
|
750 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
|
751 /* 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
|
752 |
333 | 753 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
|
754 BLOCK_INPUT; |
333 | 755 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
|
756 UNBLOCK_INPUT; |
333 | 757 b->undo_list = Qnil; |
758 | |
759 return Qt; | |
760 } | |
761 | |
550 | 762 /* Move the assoc for buffer BUF to the front of buffer-alist. Since |
763 we do this each time BUF is selected visibly, the more recently | |
764 selected buffers are always closer to the front of the list. This | |
765 means that other_buffer is more likely to choose a relevant buffer. */ | |
333 | 766 |
767 record_buffer (buf) | |
768 Lisp_Object buf; | |
769 { | |
770 register Lisp_Object link, prev; | |
771 | |
772 prev = Qnil; | |
773 for (link = Vbuffer_alist; CONSP (link); link = XCONS (link)->cdr) | |
774 { | |
775 if (EQ (XCONS (XCONS (link)->car)->cdr, buf)) | |
776 break; | |
777 prev = link; | |
778 } | |
779 | |
550 | 780 /* Effectively do Vbuffer_alist = Fdelq (link, Vbuffer_alist); |
781 we cannot use Fdelq itself here because it allows quitting. */ | |
333 | 782 |
485 | 783 if (NILP (prev)) |
333 | 784 Vbuffer_alist = XCONS (Vbuffer_alist)->cdr; |
785 else | |
786 XCONS (prev)->cdr = XCONS (XCONS (prev)->cdr)->cdr; | |
787 | |
788 XCONS(link)->cdr = Vbuffer_alist; | |
789 Vbuffer_alist = link; | |
790 } | |
791 | |
792 DEFUN ("switch-to-buffer", Fswitch_to_buffer, Sswitch_to_buffer, 1, 2, "BSwitch to buffer: ", | |
793 "Select buffer BUFFER in the current window.\n\ | |
794 BUFFER may be a buffer or a buffer name.\n\ | |
795 Optional second arg NORECORD non-nil means\n\ | |
796 do not put this buffer at the front of the list of recently selected ones.\n\ | |
797 \n\ | |
798 WARNING: This is NOT the way to work on another buffer temporarily\n\ | |
799 within a Lisp program! Use `set-buffer' instead. That avoids messing with\n\ | |
800 the window-buffer correspondences.") | |
801 (bufname, norecord) | |
802 Lisp_Object bufname, norecord; | |
803 { | |
804 register Lisp_Object buf; | |
805 Lisp_Object tem; | |
806 | |
807 if (EQ (minibuf_window, selected_window)) | |
808 error ("Cannot switch buffers in minibuffer window"); | |
809 tem = Fwindow_dedicated_p (selected_window); | |
485 | 810 if (!NILP (tem)) |
333 | 811 error ("Cannot switch buffers in a dedicated window"); |
812 | |
485 | 813 if (NILP (bufname)) |
1348
f6ab9d1e1709
(Fkill_buffer): Pass 2nd arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1308
diff
changeset
|
814 buf = Fother_buffer (Fcurrent_buffer (), Qnil); |
333 | 815 else |
816 buf = Fget_buffer_create (bufname); | |
817 Fset_buffer (buf); | |
485 | 818 if (NILP (norecord)) |
333 | 819 record_buffer (buf); |
820 | |
821 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
|
822 ? 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
|
823 : selected_window, |
333 | 824 buf); |
825 | |
826 return Qnil; | |
827 } | |
828 | |
829 DEFUN ("pop-to-buffer", Fpop_to_buffer, Spop_to_buffer, 1, 2, 0, | |
830 "Select buffer BUFFER in some window, preferably a different one.\n\ | |
831 If BUFFER is nil, then some other buffer is chosen.\n\ | |
832 If `pop-up-windows' is non-nil, windows can be split to do this.\n\ | |
833 If optional second arg OTHER-WINDOW is non-nil, insist on finding another\n\ | |
834 window even if BUFFER is already visible in the selected window.") | |
835 (bufname, other) | |
836 Lisp_Object bufname, other; | |
837 { | |
838 register Lisp_Object buf; | |
485 | 839 if (NILP (bufname)) |
1348
f6ab9d1e1709
(Fkill_buffer): Pass 2nd arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
1308
diff
changeset
|
840 buf = Fother_buffer (Fcurrent_buffer (), Qnil); |
333 | 841 else |
842 buf = Fget_buffer_create (bufname); | |
843 Fset_buffer (buf); | |
844 record_buffer (buf); | |
845 Fselect_window (Fdisplay_buffer (buf, other)); | |
846 return Qnil; | |
847 } | |
848 | |
849 DEFUN ("current-buffer", Fcurrent_buffer, Scurrent_buffer, 0, 0, 0, | |
850 "Return the current buffer as a Lisp object.") | |
851 () | |
852 { | |
853 register Lisp_Object buf; | |
854 XSET (buf, Lisp_Buffer, current_buffer); | |
855 return buf; | |
856 } | |
857 | |
858 /* Set the current buffer to b */ | |
859 | |
860 void | |
861 set_buffer_internal (b) | |
862 register struct buffer *b; | |
863 { | |
864 register struct buffer *old_buf; | |
865 register Lisp_Object tail, valcontents; | |
866 enum Lisp_Type tem; | |
867 | |
868 if (current_buffer == b) | |
869 return; | |
870 | |
871 windows_or_buffers_changed = 1; | |
872 old_buf = current_buffer; | |
873 current_buffer = b; | |
874 last_known_column_point = -1; /* invalidate indentation cache */ | |
875 | |
876 /* Look down buffer's list of local Lisp variables | |
877 to find and update any that forward into C variables. */ | |
878 | |
485 | 879 for (tail = b->local_var_alist; !NILP (tail); tail = XCONS (tail)->cdr) |
333 | 880 { |
881 valcontents = XSYMBOL (XCONS (XCONS (tail)->car)->car)->value; | |
882 if ((XTYPE (valcontents) == Lisp_Buffer_Local_Value | |
883 || XTYPE (valcontents) == Lisp_Some_Buffer_Local_Value) | |
884 && (tem = XTYPE (XCONS (valcontents)->car), | |
885 (tem == Lisp_Boolfwd || tem == Lisp_Intfwd | |
886 || tem == Lisp_Objfwd))) | |
887 /* Just reference the variable | |
888 to cause it to become set for this buffer. */ | |
889 Fsymbol_value (XCONS (XCONS (tail)->car)->car); | |
890 } | |
891 | |
892 /* Do the same with any others that were local to the previous buffer */ | |
893 | |
894 if (old_buf) | |
485 | 895 for (tail = old_buf->local_var_alist; !NILP (tail); tail = XCONS (tail)->cdr) |
333 | 896 { |
897 valcontents = XSYMBOL (XCONS (XCONS (tail)->car)->car)->value; | |
898 if ((XTYPE (valcontents) == Lisp_Buffer_Local_Value | |
899 || XTYPE (valcontents) == Lisp_Some_Buffer_Local_Value) | |
900 && (tem = XTYPE (XCONS (valcontents)->car), | |
901 (tem == Lisp_Boolfwd || tem == Lisp_Intfwd | |
902 || tem == Lisp_Objfwd))) | |
903 /* Just reference the variable | |
904 to cause it to become set for this buffer. */ | |
905 Fsymbol_value (XCONS (XCONS (tail)->car)->car); | |
906 } | |
907 } | |
908 | |
909 DEFUN ("set-buffer", Fset_buffer, Sset_buffer, 1, 1, 0, | |
910 "Make the buffer BUFFER current for editing operations.\n\ | |
911 BUFFER may be a buffer or the name of an existing buffer.\n\ | |
912 See also `save-excursion' when you want to make a buffer current temporarily.\n\ | |
913 This function does not display the buffer, so its effect ends\n\ | |
914 when the current command terminates.\n\ | |
915 Use `switch-to-buffer' or `pop-to-buffer' to switch buffers permanently.") | |
916 (bufname) | |
917 register Lisp_Object bufname; | |
918 { | |
919 register Lisp_Object buffer; | |
920 buffer = Fget_buffer (bufname); | |
485 | 921 if (NILP (buffer)) |
333 | 922 nsberror (bufname); |
485 | 923 if (NILP (XBUFFER (buffer)->name)) |
333 | 924 error ("Selecting deleted buffer"); |
925 set_buffer_internal (XBUFFER (buffer)); | |
926 return buffer; | |
927 } | |
928 | |
929 DEFUN ("barf-if-buffer-read-only", Fbarf_if_buffer_read_only, | |
930 Sbarf_if_buffer_read_only, 0, 0, 0, | |
931 "Signal a `buffer-read-only' error if the current buffer is read-only.") | |
932 () | |
933 { | |
485 | 934 while (!NILP (current_buffer->read_only)) |
333 | 935 Fsignal (Qbuffer_read_only, (Fcons (Fcurrent_buffer (), Qnil))); |
936 return Qnil; | |
937 } | |
938 | |
939 DEFUN ("bury-buffer", Fbury_buffer, Sbury_buffer, 0, 1, "", | |
940 "Put BUFFER at the end of the list of all buffers.\n\ | |
941 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
|
942 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
|
943 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
|
944 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
|
945 selected window if it is displayed there.") |
333 | 946 (buf) |
947 register Lisp_Object buf; | |
948 { | |
1252
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
949 /* Figure out what buffer we're going to bury. */ |
485 | 950 if (NILP (buf)) |
1586
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
951 { |
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
952 XSET (buf, Lisp_Buffer, current_buffer); |
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
953 |
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
954 /* 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
|
955 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
|
956 } |
333 | 957 else |
958 { | |
959 Lisp_Object buf1; | |
960 | |
961 buf1 = Fget_buffer (buf); | |
485 | 962 if (NILP (buf1)) |
333 | 963 nsberror (buf); |
964 buf = buf1; | |
1252
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
965 } |
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
966 |
1586
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
967 /* 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
|
968 { |
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
969 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
|
970 |
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
971 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
|
972 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
|
973 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
|
974 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
|
975 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
|
976 } |
86a17674c2a1
* buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents:
1195
diff
changeset
|
977 |
333 | 978 return Qnil; |
979 } | |
980 | |
1953
714df59790af
(Ferase_buffer): Added interactive spec.
Roland McGrath <roland@gnu.org>
parents:
1952
diff
changeset
|
981 DEFUN ("erase-buffer", Ferase_buffer, Serase_buffer, 0, 0, "*", |
333 | 982 "Delete the entire contents of the current buffer.\n\ |
1586
f84e400808d0
* buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1563
diff
changeset
|
983 Any clipping restriction in effect (see `narrow-to-region') is removed,\n\ |
333 | 984 so the buffer is truly empty after this.") |
985 () | |
986 { | |
987 Fwiden (); | |
988 del_range (BEG, Z); | |
989 current_buffer->last_window_start = 1; | |
990 /* Prevent warnings, or suspension of auto saving, that would happen | |
991 if future size is less than past size. Use of erase-buffer | |
992 implies that the future text is not really related to the past text. */ | |
993 XFASTINT (current_buffer->save_length) = 0; | |
994 return Qnil; | |
995 } | |
996 | |
997 validate_region (b, e) | |
998 register Lisp_Object *b, *e; | |
999 { | |
1000 register int i; | |
1001 | |
1002 CHECK_NUMBER_COERCE_MARKER (*b, 0); | |
1003 CHECK_NUMBER_COERCE_MARKER (*e, 1); | |
1004 | |
1005 if (XINT (*b) > XINT (*e)) | |
1006 { | |
1007 i = XFASTINT (*b); /* This is legit even if *b is < 0 */ | |
1008 *b = *e; | |
1009 XFASTINT (*e) = i; /* because this is all we do with i. */ | |
1010 } | |
1011 | |
1012 if (!(BEGV <= XINT (*b) && XINT (*b) <= XINT (*e) | |
1013 && XINT (*e) <= ZV)) | |
1014 args_out_of_range (*b, *e); | |
1015 } | |
1016 | |
1017 Lisp_Object | |
1018 list_buffers_1 (files) | |
1019 Lisp_Object files; | |
1020 { | |
1021 register Lisp_Object tail, tem, buf; | |
1022 Lisp_Object col1, col2, col3, minspace; | |
1023 register struct buffer *old = current_buffer, *b; | |
1024 int desired_point = 0; | |
1025 Lisp_Object other_file_symbol; | |
1026 | |
1027 other_file_symbol = intern ("list-buffers-directory"); | |
1028 | |
1029 XFASTINT (col1) = 19; | |
1030 XFASTINT (col2) = 25; | |
1031 XFASTINT (col3) = 40; | |
1032 XFASTINT (minspace) = 1; | |
1033 | |
1034 Fset_buffer (Vstandard_output); | |
1035 | |
1036 tail = intern ("Buffer-menu-mode"); | |
1037 if (!EQ (tail, current_buffer->major_mode) | |
485 | 1038 && (tem = Ffboundp (tail), !NILP (tem))) |
333 | 1039 call0 (tail); |
1040 Fbuffer_disable_undo (Vstandard_output); | |
1041 current_buffer->read_only = Qnil; | |
1042 | |
1043 write_string ("\ | |
1044 MR Buffer Size Mode File\n\ | |
1045 -- ------ ---- ---- ----\n", -1); | |
1046 | |
485 | 1047 for (tail = Vbuffer_alist; !NILP (tail); tail = Fcdr (tail)) |
333 | 1048 { |
1049 buf = Fcdr (Fcar (tail)); | |
1050 b = XBUFFER (buf); | |
1051 /* Don't mention the minibuffers. */ | |
1052 if (XSTRING (b->name)->data[0] == ' ') | |
1053 continue; | |
1054 /* Optionally don't mention buffers that lack files. */ | |
485 | 1055 if (!NILP (files) && NILP (b->filename)) |
333 | 1056 continue; |
1057 /* Identify the current buffer. */ | |
1058 if (b == old) | |
1059 desired_point = point; | |
1060 write_string (b == old ? "." : " ", -1); | |
1061 /* Identify modified buffers */ | |
1062 write_string (BUF_MODIFF (b) > b->save_modified ? "*" : " ", -1); | |
485 | 1063 write_string (NILP (b->read_only) ? " " : "% ", -1); |
333 | 1064 Fprinc (b->name, Qnil); |
1065 Findent_to (col1, make_number (2)); | |
1066 XFASTINT (tem) = BUF_Z (b) - BUF_BEG (b); | |
1067 Fprin1 (tem, Qnil); | |
1068 Findent_to (col2, minspace); | |
1069 Fprinc (b->mode_name, Qnil); | |
1070 Findent_to (col3, minspace); | |
1071 | |
485 | 1072 if (!NILP (b->filename)) |
333 | 1073 Fprinc (b->filename, Qnil); |
1074 else | |
1075 { | |
1076 /* No visited file; check local value of list-buffers-directory. */ | |
1077 Lisp_Object tem; | |
1078 set_buffer_internal (b); | |
1079 tem = Fboundp (other_file_symbol); | |
485 | 1080 if (!NILP (tem)) |
333 | 1081 { |
1082 tem = Fsymbol_value (other_file_symbol); | |
1083 Fset_buffer (Vstandard_output); | |
1084 if (XTYPE (tem) == Lisp_String) | |
1085 Fprinc (tem, Qnil); | |
1086 } | |
1087 else | |
1088 Fset_buffer (Vstandard_output); | |
1089 } | |
1090 write_string ("\n", -1); | |
1091 } | |
1092 | |
1093 current_buffer->read_only = Qt; | |
1094 set_buffer_internal (old); | |
1095 /* Foo. This doesn't work since temp_output_buffer_show sets point to 1 | |
1096 if (desired_point) | |
1097 XBUFFER (Vstandard_output)->text.pointloc = desired_point; | |
1098 */ | |
1099 return Qnil; | |
1100 } | |
1101 | |
1102 DEFUN ("list-buffers", Flist_buffers, Slist_buffers, 0, 1, "P", | |
1103 "Display a list of names of existing buffers.\n\ | |
1104 The list is displayed in a buffer named `*Buffer List*'.\n\ | |
1105 Note that buffers with names starting with spaces are omitted.\n\ | |
1106 Non-null optional arg FILES-ONLY means mention only file buffers.\n\ | |
1107 \n\ | |
1108 The M column contains a * for buffers that are modified.\n\ | |
1109 The R column contains a % for buffers that are read-only.") | |
1110 (files) | |
1111 Lisp_Object files; | |
1112 { | |
1113 internal_with_output_to_temp_buffer ("*Buffer List*", | |
1114 list_buffers_1, files); | |
1115 return Qnil; | |
1116 } | |
1117 | |
1118 DEFUN ("kill-all-local-variables", Fkill_all_local_variables, Skill_all_local_variables, | |
1119 0, 0, 0, | |
1120 "Switch to Fundamental mode by killing current buffer's local variables.\n\ | |
1121 Most local variable bindings are eliminated so that the default values\n\ | |
1122 become effective once more. Also, the syntax table is set from\n\ | |
1123 `standard-syntax-table', the local keymap is set to nil,\n\ | |
1124 and the abbrev table from `fundamental-mode-abbrev-table'.\n\ | |
1125 This function also forces redisplay of the mode line.\n\ | |
1126 \n\ | |
1127 Every function to select a new major mode starts by\n\ | |
1128 calling this function.\n\n\ | |
1129 As a special exception, local variables whose names have\n\ | |
1130 a non-nil `permanent-local' property are not eliminated by this function.") | |
1131 () | |
1132 { | |
1133 register Lisp_Object alist, sym, tem; | |
1134 Lisp_Object oalist; | |
1135 oalist = current_buffer->local_var_alist; | |
1136 | |
1137 /* Make sure no local variables remain set up with this buffer | |
1138 for their current values. */ | |
1139 | |
485 | 1140 for (alist = oalist; !NILP (alist); alist = XCONS (alist)->cdr) |
333 | 1141 { |
1142 sym = XCONS (XCONS (alist)->car)->car; | |
1143 | |
1144 /* Need not do anything if some other buffer's binding is now encached. */ | |
1145 tem = XCONS (XCONS (XSYMBOL (sym)->value)->cdr)->car; | |
1146 if (XBUFFER (tem) == current_buffer) | |
1147 { | |
1148 /* Symbol is set up for this buffer's old local value. | |
1149 Set it up for the current buffer with the default value. */ | |
1150 | |
1151 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
|
1152 /* 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
|
1153 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
|
1154 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
|
1155 we don't lose the value. */ |
d5d7e6996604
(Fkill_all_local_variables): Store each var's current value
Richard M. Stallman <rms@gnu.org>
parents:
2480
diff
changeset
|
1156 XCONS (XCONS (tem)->car)->cdr = XCONS (XSYMBOL (sym)->value)->car; |
d5d7e6996604
(Fkill_all_local_variables): Store each var's current value
Richard M. Stallman <rms@gnu.org>
parents:
2480
diff
changeset
|
1157 /* Switch to the symbol's default-value alist entry. */ |
333 | 1158 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
|
1159 /* Mark it as current for the current buffer. */ |
333 | 1160 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
|
1161 /* Store the current value into any forwarding in the symbol. */ |
333 | 1162 store_symval_forwarding (sym, XCONS (XSYMBOL (sym)->value)->car, |
1163 XCONS (tem)->cdr); | |
1164 } | |
1165 } | |
1166 | |
1167 /* Actually eliminate all local bindings of this buffer. */ | |
1168 | |
1169 reset_buffer_local_variables (current_buffer); | |
1170 | |
1171 /* Redisplay mode lines; we are changing major mode. */ | |
1172 | |
1173 update_mode_lines++; | |
1174 | |
1175 /* Any which are supposed to be permanent, | |
1176 make local again, with the same values they had. */ | |
1177 | |
485 | 1178 for (alist = oalist; !NILP (alist); alist = XCONS (alist)->cdr) |
333 | 1179 { |
1180 sym = XCONS (XCONS (alist)->car)->car; | |
1181 tem = Fget (sym, Qpermanent_local); | |
485 | 1182 if (! NILP (tem)) |
392 | 1183 { |
1184 Fmake_local_variable (sym); | |
1185 Fset (sym, XCONS (XCONS (alist)->car)->cdr); | |
1186 } | |
333 | 1187 } |
1188 | |
1189 /* Force mode-line redisplay. Useful here because all major mode | |
1190 commands call this function. */ | |
1191 update_mode_lines++; | |
1192 | |
1193 return Qnil; | |
1194 } | |
1195 | |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1196 /* 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
|
1197 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
|
1198 Store in *LEN_PTR the size allocated for the vector. |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1199 Store in *NEXT_PTR the next position after POS where an overlay starts. |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1200 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1201 *VEC_PTR and *LEN_PTR should contain a valid vector and size |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1202 when this function is called. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1203 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1204 int |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1205 overlays_at (pos, vec_ptr, len_ptr, next_ptr) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1206 int pos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1207 Lisp_Object **vec_ptr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1208 int *len_ptr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1209 int *next_ptr; |
333 | 1210 { |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1211 Lisp_Object tail, overlay, start, end, result; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1212 int idx = 0; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1213 int len = *len_ptr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1214 Lisp_Object *vec = *vec_ptr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1215 int next = ZV; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1216 int startpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1217 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1218 for (tail = current_buffer->overlays_before; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1219 CONSP (tail); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1220 tail = XCONS (tail)->cdr) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1221 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1222 overlay = XCONS (tail)->car; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1223 if (! OVERLAY_VALID (overlay)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1224 continue; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1225 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1226 start = OVERLAY_START (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1227 end = OVERLAY_END (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1228 if (OVERLAY_POSITION (end) <= pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1229 break; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1230 startpos = OVERLAY_POSITION (start); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1231 if (startpos <= pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1232 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1233 if (idx == len) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1234 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1235 *len_ptr = len *= 2; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1236 vec = (Lisp_Object *) xrealloc (vec, len * sizeof (Lisp_Object)); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1237 *vec_ptr = vec; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1238 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1239 vec[idx++] = overlay; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1240 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1241 else if (startpos < next) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1242 next = startpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1243 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1244 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1245 for (tail = current_buffer->overlays_after; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1246 CONSP (tail); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1247 tail = XCONS (tail)->cdr) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1248 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1249 overlay = XCONS (tail)->car; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1250 if (! OVERLAY_VALID (overlay)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1251 continue; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1252 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1253 start = OVERLAY_START (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1254 end = OVERLAY_END (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1255 startpos = OVERLAY_POSITION (start); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1256 if (startpos > pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1257 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1258 if (startpos < next) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1259 next = startpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1260 break; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1261 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1262 if (OVERLAY_POSITION (end) > pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1263 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1264 if (idx == len) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1265 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1266 *len_ptr = len *= 2; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1267 vec = (Lisp_Object *) xrealloc (vec, len * sizeof (Lisp_Object)); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1268 *vec_ptr = vec; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1269 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1270 vec[idx++] = overlay; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1271 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1272 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1273 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1274 *next_ptr = next; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1275 return idx; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1276 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1277 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1278 /* Shift overlays in BUF's overlay lists, to center the lists at POS. */ |
333 | 1279 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1280 void |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1281 recenter_overlay_lists (buf, pos) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1282 struct buffer *buf; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1283 int pos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1284 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1285 Lisp_Object overlay, tail, next, prev, beg, end; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1286 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1287 /* 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
|
1288 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1289 /* 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
|
1290 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
|
1291 with some future change. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1292 prev = Qnil; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1293 for (tail = buf->overlays_before; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1294 CONSP (tail); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1295 prev = tail, tail = next) |
333 | 1296 { |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1297 next = XCONS (tail)->cdr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1298 overlay = XCONS (tail)->car; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1299 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1300 /* 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
|
1301 if (!OVERLAY_VALID (overlay)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1302 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1303 /* 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
|
1304 if (!NILP (prev)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1305 XCONS (prev)->cdr = next; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1306 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1307 buf->overlays_before = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1308 tail = prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1309 continue; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1310 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1311 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1312 beg = OVERLAY_START (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1313 end = OVERLAY_END (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1314 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1315 if (OVERLAY_POSITION (end) > pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1316 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1317 /* OVERLAY needs to be moved. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1318 int where = OVERLAY_POSITION (beg); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1319 Lisp_Object other, other_prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1320 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1321 /* 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
|
1322 if (!NILP (prev)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1323 XCONS (prev)->cdr = next; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1324 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1325 buf->overlays_before = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1326 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1327 /* 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
|
1328 other_prev = Qnil; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1329 for (other = buf->overlays_after; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1330 CONSP (other); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1331 other_prev = other, other = XCONS (other)->cdr) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1332 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1333 Lisp_Object otherbeg, otheroverlay, follower; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1334 int win; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1335 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1336 otheroverlay = XCONS (other)->car; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1337 if (! OVERLAY_VALID (otheroverlay)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1338 continue; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1339 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1340 otherbeg = OVERLAY_START (otheroverlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1341 if (OVERLAY_POSITION (otherbeg) >= where) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1342 break; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1343 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1344 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1345 /* Add TAIL to overlays_after before OTHER. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1346 XCONS (tail)->cdr = other; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1347 if (!NILP (other_prev)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1348 XCONS (other_prev)->cdr = tail; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1349 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1350 buf->overlays_after = tail; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1351 tail = prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1352 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1353 else |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1354 /* 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
|
1355 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
|
1356 so stop now. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1357 break; |
333 | 1358 } |
1359 | |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1360 /* 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
|
1361 prev = Qnil; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1362 for (tail = buf->overlays_after; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1363 CONSP (tail); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1364 prev = tail, tail = next) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1365 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1366 next = XCONS (tail)->cdr; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1367 overlay = XCONS (tail)->car; |
333 | 1368 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1369 /* 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
|
1370 if (!OVERLAY_VALID (overlay)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1371 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1372 /* 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
|
1373 if (!NILP (prev)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1374 XCONS (prev)->cdr = next; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1375 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1376 buf->overlays_after = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1377 tail = prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1378 continue; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1379 } |
333 | 1380 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1381 beg = OVERLAY_START (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1382 end = OVERLAY_END (overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1383 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1384 /* Stop looking, when we know that nothing further |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1385 can possibly end before POS. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1386 if (OVERLAY_POSITION (beg) > pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1387 break; |
333 | 1388 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1389 if (OVERLAY_POSITION (end) <= pos) |
333 | 1390 { |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1391 /* OVERLAY needs to be moved. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1392 int where = OVERLAY_POSITION (end); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1393 Lisp_Object other, other_prev; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1394 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1395 /* 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
|
1396 if (!NILP (prev)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1397 XCONS (prev)->cdr = next; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1398 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1399 buf->overlays_after = next; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1400 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1401 /* 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
|
1402 other_prev = Qnil; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1403 for (other = buf->overlays_before; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1404 CONSP (other); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1405 other_prev = other, other = XCONS (other)->cdr) |
333 | 1406 { |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1407 Lisp_Object otherend, otheroverlay; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1408 int win; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1409 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1410 otheroverlay = XCONS (other)->car; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1411 if (! OVERLAY_VALID (otheroverlay)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1412 continue; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1413 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1414 otherend = OVERLAY_END (otheroverlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1415 if (OVERLAY_POSITION (otherend) <= where) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1416 break; |
333 | 1417 } |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1418 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1419 /* Add TAIL to overlays_before before OTHER. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1420 XCONS (tail)->cdr = other; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1421 if (!NILP (other_prev)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1422 XCONS (other_prev)->cdr = tail; |
333 | 1423 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1424 buf->overlays_before = tail; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1425 tail = prev; |
333 | 1426 } |
1427 } | |
1428 | |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1429 XFASTINT (buf->overlay_center) = pos; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1430 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1431 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1432 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
|
1433 "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
|
1434 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
|
1435 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
|
1436 (beg, end, buffer) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1437 Lisp_Object beg, end, buffer; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1438 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1439 Lisp_Object overlay; |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1440 struct buffer *b; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1441 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1442 if (NILP (buffer)) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1443 XSET (buffer, Lisp_Buffer, current_buffer); |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1444 CHECK_BUFFER (buffer, 2); |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1445 |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1446 b = XBUFFER (buffer); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1447 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1448 if (MARKERP (beg)) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1449 { |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1450 if (! EQ (Fmarker_buffer (beg), buffer)) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1451 error ("Marker points into wrong buffer"); |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1452 else |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1453 beg = Fcopy_marker (beg); |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1454 } |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1455 else |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1456 beg = Fset_marker (Fmake_marker (), beg, buffer); |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1457 if (MARKERP (end)) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1458 { |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1459 if (! EQ (Fmarker_buffer (end), buffer)) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1460 error ("Marker points into wrong buffer"); |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1461 else |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1462 end = Fcopy_marker (end); |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1463 } |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1464 else |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1465 end = Fset_marker (Fmake_marker (), end, buffer); |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1466 |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1467 overlay = Fcons (Fcons (beg, end), Qnil); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1468 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1469 /* Put the new overlay on the wrong list. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1470 end = OVERLAY_END (overlay); |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1471 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
|
1472 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
|
1473 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1474 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
|
1475 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1476 /* 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
|
1477 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
|
1478 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1479 return overlay; |
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 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1482 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
|
1483 "Set the endpoints of OVERLAY to BEG and END in BUFFER.\n\ |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1484 If omitted, don't change OVERLAY's buffer.") |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1485 (overlay, beg, end, buffer) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1486 Lisp_Object overlay, beg, end, buffer; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1487 { |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1488 struct buffer *b; |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1489 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1490 if (!OVERLAY_VALID (overlay)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1491 error ("Invalid overlay object"); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1492 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1493 if (NILP (buffer)) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1494 buffer = Fmarker_buffer (OVERLAY_START (overlay)); |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1495 CHECK_BUFFER (buffer, 3); |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1496 |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1497 b = XBUFFER (buffer); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1498 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1499 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
|
1500 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
|
1501 |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1502 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
|
1503 Fset_marker (OVERLAY_END (overlay), end, buffer); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1504 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1505 /* Put the overlay on the wrong list. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1506 end = OVERLAY_END (overlay); |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1507 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
|
1508 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
|
1509 else |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1510 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
|
1511 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1512 /* 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
|
1513 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
|
1514 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1515 return overlay; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1516 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1517 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1518 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
|
1519 "Delete the overlay OVERLAY from its buffer.") |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1520 (overlay) |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1521 Lisp_Object overlay; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1522 { |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1523 struct buffer *b; |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1524 |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1525 if (OVERLAY_VALID (overlay)) |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1526 b = XBUFFER (Fmarker_buffer (OVERLAY_START (overlay))); |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1527 else |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1528 /* Guess! */ |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1529 b = current_buffer; |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1530 |
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1531 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
|
1532 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
|
1533 |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1534 return Qnil; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1535 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1536 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1537 DEFUN ("overlays-at", Foverlays_at, Soverlays_at, 1, 1, 0, |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1538 "Return a list of the overays that contain position POS.") |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1539 (pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1540 Lisp_Object pos; |
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 int noverlays; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1543 int endpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1544 Lisp_Object *overlay_vec; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1545 int len; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1546 Lisp_Object result; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1547 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1548 CHECK_NUMBER_COERCE_MARKER (pos, 0); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1549 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1550 len = 10; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1551 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
|
1552 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1553 /* 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
|
1554 Store the length in len. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1555 noverlays = overlays_at (XINT (pos), &overlay_vec, &len, &endpos); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1556 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1557 /* Make a list of them all. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1558 result = Flist (noverlays, overlay_vec); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1559 |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
1560 xfree (overlay_vec); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1561 return result; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1562 } |
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 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
|
1565 1, 1, 0, |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1566 "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
|
1567 (pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1568 Lisp_Object pos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1569 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1570 int noverlays; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1571 int endpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1572 Lisp_Object *overlay_vec; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1573 int len; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1574 Lisp_Object result; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1575 int i; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1576 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1577 CHECK_NUMBER_COERCE_MARKER (pos, 0); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1578 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1579 len = 10; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1580 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
|
1581 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1582 /* 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
|
1583 Store the length in len. |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1584 endpos gets the position where the next overlay starts. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1585 noverlays = overlays_at (XINT (pos), &overlay_vec, &len, &endpos); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1586 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1587 /* If any of these overlays ends before endpos, |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1588 use its ending point instead. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1589 for (i = 0; i < noverlays; i++) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1590 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1591 Lisp_Object oend; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1592 int oendpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1593 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1594 oend = OVERLAY_END (overlay_vec[i]); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1595 oendpos = OVERLAY_POSITION (oend); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1596 if (oendpos < endpos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1597 endpos = oendpos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1598 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1599 |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2389
diff
changeset
|
1600 xfree (overlay_vec); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1601 return make_number (endpos); |
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 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1604 /* These functions are for debugging overlays. */ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1605 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1606 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
|
1607 "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
|
1608 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
|
1609 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
|
1610 Recentering overlays moves overlays between these lists.\n\ |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1611 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
|
1612 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
|
1613 () |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1614 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1615 Lisp_Object before, after; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1616 before = current_buffer->overlays_before; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1617 if (CONSP (before)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1618 before = Fcopy_sequence (before); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1619 after = current_buffer->overlays_after; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1620 if (CONSP (after)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1621 after = Fcopy_sequence (after); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1622 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1623 return Fcons (before, after); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1624 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1625 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1626 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
|
1627 "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
|
1628 (pos) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1629 Lisp_Object pos; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1630 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1631 CHECK_NUMBER_COERCE_MARKER (pos, 0); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1632 |
2508
3aa2f3b35353
* buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents:
2486
diff
changeset
|
1633 recenter_overlay_lists (current_buffer, XINT (pos)); |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1634 return Qnil; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1635 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1636 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1637 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
|
1638 "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
|
1639 (overlay, prop) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1640 Lisp_Object overlay, prop; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1641 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1642 Lisp_Object plist; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1643 for (plist = Fcdr_safe (Fcdr_safe (overlay)); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1644 CONSP (plist) && CONSP (XCONS (plist)->cdr); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1645 plist = XCONS (XCONS (plist)->cdr)->cdr) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1646 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1647 if (EQ (XCONS (plist)->car, prop)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1648 return XCONS (XCONS (plist)->cdr)->car; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1649 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1650 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1651 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1652 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
|
1653 "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
|
1654 (overlay, prop, value) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1655 Lisp_Object overlay, prop, value; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1656 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1657 Lisp_Object plist, tail; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1658 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1659 plist = Fcdr_safe (Fcdr_safe (overlay)); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1660 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1661 for (tail = plist; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1662 CONSP (tail) && CONSP (XCONS (tail)->cdr); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1663 tail = XCONS (XCONS (tail)->cdr)->cdr) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1664 { |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1665 if (EQ (XCONS (tail)->car, prop)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1666 return XCONS (XCONS (tail)->cdr)->car = value; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1667 } |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1668 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1669 if (! CONSP (XCONS (overlay)->cdr)) |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1670 XCONS (overlay)->cdr = Fcons (Qnil, Qnil); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1671 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1672 XCONS (XCONS (overlay)->cdr)->cdr |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1673 = Fcons (prop, Fcons (value, plist)); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1674 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1675 return value; |
333 | 1676 } |
1677 | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
1678 /* 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
|
1679 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
|
1680 void |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
1681 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
|
1682 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
|
1683 { |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
1684 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
|
1685 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
|
1686 (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
|
1687 ->name->data); |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
1688 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
|
1689 |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
1690 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
|
1691 { |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
1692 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
|
1693 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
|
1694 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
|
1695 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
|
1696 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
|
1697 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
|
1698 default: |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
1699 abort (); |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
1700 } |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
1701 |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
1702 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
|
1703 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
|
1704 } |
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
1705 |
333 | 1706 init_buffer_once () |
1707 { | |
1708 register Lisp_Object tem; | |
1709 | |
1710 /* Make sure all markable slots in buffer_defaults | |
1711 are initialized reasonably, so mark_buffer won't choke. */ | |
1712 reset_buffer (&buffer_defaults); | |
1713 reset_buffer (&buffer_local_symbols); | |
1714 XSET (Vbuffer_defaults, Lisp_Buffer, &buffer_defaults); | |
1715 XSET (Vbuffer_local_symbols, Lisp_Buffer, &buffer_local_symbols); | |
1716 | |
1717 /* Set up the default values of various buffer slots. */ | |
1718 /* Must do these before making the first buffer! */ | |
1719 | |
1720 /* real setup is done in loaddefs.el */ | |
1721 buffer_defaults.mode_line_format = build_string ("%-"); | |
1722 buffer_defaults.abbrev_mode = Qnil; | |
1723 buffer_defaults.overwrite_mode = Qnil; | |
1724 buffer_defaults.case_fold_search = Qt; | |
1725 buffer_defaults.auto_fill_function = Qnil; | |
1726 buffer_defaults.selective_display = Qnil; | |
1727 #ifndef old | |
1728 buffer_defaults.selective_display_ellipses = Qt; | |
1729 #endif | |
1730 buffer_defaults.abbrev_table = Qnil; | |
1731 buffer_defaults.display_table = Qnil; | |
1732 buffer_defaults.undo_list = Qnil; | |
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
1733 buffer_defaults.mark_active = Qnil; |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1734 buffer_defaults.overlays_before = Qnil; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1735 buffer_defaults.overlays_after = Qnil; |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
1736 XFASTINT (buffer_defaults.overlay_center) = 1; |
333 | 1737 |
1738 XFASTINT (buffer_defaults.tab_width) = 8; | |
1739 buffer_defaults.truncate_lines = Qnil; | |
1740 buffer_defaults.ctl_arrow = Qt; | |
1741 | |
1742 XFASTINT (buffer_defaults.fill_column) = 70; | |
1743 XFASTINT (buffer_defaults.left_margin) = 0; | |
1744 | |
1745 /* Assign the local-flags to the slots that have default values. | |
1746 The local flag is a bit that is used in the buffer | |
1747 to say that it has its own local value for the slot. | |
1748 The local flag bits are in the local_var_flags slot of the buffer. */ | |
1749 | |
1750 /* Nothing can work if this isn't true */ | |
1751 if (sizeof (int) != sizeof (Lisp_Object)) abort (); | |
1752 | |
1753 /* 0 means not a lisp var, -1 means always local, else mask */ | |
1754 bzero (&buffer_local_flags, sizeof buffer_local_flags); | |
1755 XFASTINT (buffer_local_flags.filename) = -1; | |
1756 XFASTINT (buffer_local_flags.directory) = -1; | |
1757 XFASTINT (buffer_local_flags.backed_up) = -1; | |
1758 XFASTINT (buffer_local_flags.save_length) = -1; | |
1759 XFASTINT (buffer_local_flags.auto_save_file_name) = -1; | |
1760 XFASTINT (buffer_local_flags.read_only) = -1; | |
1761 XFASTINT (buffer_local_flags.major_mode) = -1; | |
1762 XFASTINT (buffer_local_flags.mode_name) = -1; | |
1763 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
|
1764 XFASTINT (buffer_local_flags.mark_active) = -1; |
333 | 1765 |
1766 XFASTINT (buffer_local_flags.mode_line_format) = 1; | |
1767 XFASTINT (buffer_local_flags.abbrev_mode) = 2; | |
1768 XFASTINT (buffer_local_flags.overwrite_mode) = 4; | |
1769 XFASTINT (buffer_local_flags.case_fold_search) = 8; | |
1770 XFASTINT (buffer_local_flags.auto_fill_function) = 0x10; | |
1771 XFASTINT (buffer_local_flags.selective_display) = 0x20; | |
1772 #ifndef old | |
1773 XFASTINT (buffer_local_flags.selective_display_ellipses) = 0x40; | |
1774 #endif | |
1775 XFASTINT (buffer_local_flags.tab_width) = 0x80; | |
1776 XFASTINT (buffer_local_flags.truncate_lines) = 0x100; | |
1777 XFASTINT (buffer_local_flags.ctl_arrow) = 0x200; | |
1778 XFASTINT (buffer_local_flags.fill_column) = 0x400; | |
1779 XFASTINT (buffer_local_flags.left_margin) = 0x800; | |
1780 XFASTINT (buffer_local_flags.abbrev_table) = 0x1000; | |
1781 XFASTINT (buffer_local_flags.display_table) = 0x2000; | |
1782 XFASTINT (buffer_local_flags.syntax_table) = 0x8000; | |
1783 | |
1784 Vbuffer_alist = Qnil; | |
1785 current_buffer = 0; | |
1786 all_buffers = 0; | |
1787 | |
1788 QSFundamental = build_string ("Fundamental"); | |
1789 | |
1790 Qfundamental_mode = intern ("fundamental-mode"); | |
1791 buffer_defaults.major_mode = Qfundamental_mode; | |
1792 | |
1793 Qmode_class = intern ("mode-class"); | |
1794 | |
1795 Qprotected_field = intern ("protected-field"); | |
1796 | |
1797 Qpermanent_local = intern ("permanent-local"); | |
1798 | |
1799 Qkill_buffer_hook = intern ("kill-buffer-hook"); | |
1800 | |
1801 Vprin1_to_string_buffer = Fget_buffer_create (build_string (" prin1")); | |
1802 /* super-magic invisible buffer */ | |
1803 Vbuffer_alist = Qnil; | |
1804 | |
648 | 1805 Fset_buffer (Fget_buffer_create (build_string ("*scratch*"))); |
333 | 1806 } |
1807 | |
1808 init_buffer () | |
1809 { | |
1810 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
|
1811 char *pwd; |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
1812 struct stat dotstat, pwdstat; |
333 | 1813 |
1814 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
|
1815 |
e721339972b0
* buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents:
1501
diff
changeset
|
1816 /* 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
|
1817 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
|
1818 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
|
1819 && 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
|
1820 && 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
|
1821 && 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
|
1822 && 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
|
1823 && 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
|
1824 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
|
1825 else if (getwd (buf) == 0) |
333 | 1826 fatal ("`getwd' failed: %s.\n", buf); |
1827 | |
1828 #ifndef VMS | |
1829 /* Maybe this should really use some standard subroutine | |
1830 whose definition is filename syntax dependent. */ | |
1831 if (buf[strlen (buf) - 1] != '/') | |
1832 strcat (buf, "/"); | |
1833 #endif /* not VMS */ | |
1834 current_buffer->directory = build_string (buf); | |
1835 } | |
1836 | |
1837 /* initialize the buffer routines */ | |
1838 syms_of_buffer () | |
1839 { | |
2060
7eea4dfc5133
(syms_of_buffer): Make erase-buffer a disabled command.
Roland McGrath <roland@gnu.org>
parents:
2043
diff
changeset
|
1840 extern Lisp_Object Qdisabled; |
7eea4dfc5133
(syms_of_buffer): Make erase-buffer a disabled command.
Roland McGrath <roland@gnu.org>
parents:
2043
diff
changeset
|
1841 |
333 | 1842 staticpro (&Vbuffer_defaults); |
1843 staticpro (&Vbuffer_local_symbols); | |
1844 staticpro (&Qfundamental_mode); | |
1845 staticpro (&Qmode_class); | |
1846 staticpro (&QSFundamental); | |
1847 staticpro (&Vbuffer_alist); | |
1848 staticpro (&Qprotected_field); | |
1849 staticpro (&Qpermanent_local); | |
1850 staticpro (&Qkill_buffer_hook); | |
1851 | |
1852 Fput (Qprotected_field, Qerror_conditions, | |
1853 Fcons (Qprotected_field, Fcons (Qerror, Qnil))); | |
1854 Fput (Qprotected_field, Qerror_message, | |
1855 build_string ("Attempt to modify a protected field")); | |
1856 | |
2060
7eea4dfc5133
(syms_of_buffer): Make erase-buffer a disabled command.
Roland McGrath <roland@gnu.org>
parents:
2043
diff
changeset
|
1857 Fput (intern ("erase-buffer"), Qdisabled, Qt); |
7eea4dfc5133
(syms_of_buffer): Make erase-buffer a disabled command.
Roland McGrath <roland@gnu.org>
parents:
2043
diff
changeset
|
1858 |
333 | 1859 /* All these use DEFVAR_LISP_NOPRO because the slots in |
1860 buffer_defaults will all be marked via Vbuffer_defaults. */ | |
1861 | |
1862 DEFVAR_LISP_NOPRO ("default-mode-line-format", | |
1863 &buffer_defaults.mode_line_format, | |
1864 "Default value of `mode-line-format' for buffers that don't override it.\n\ | |
1865 This is the same as (default-value 'mode-line-format)."); | |
1866 | |
1867 DEFVAR_LISP_NOPRO ("default-abbrev-mode", | |
1868 &buffer_defaults.abbrev_mode, | |
1869 "Default value of `abbrev-mode' for buffers that do not override it.\n\ | |
1870 This is the same as (default-value 'abbrev-mode)."); | |
1871 | |
1872 DEFVAR_LISP_NOPRO ("default-ctl-arrow", | |
1873 &buffer_defaults.ctl_arrow, | |
1874 "Default value of `ctl-arrow' for buffers that do not override it.\n\ | |
1875 This is the same as (default-value 'ctl-arrow)."); | |
1876 | |
1877 DEFVAR_LISP_NOPRO ("default-truncate-lines", | |
1878 &buffer_defaults.truncate_lines, | |
1879 "Default value of `truncate-lines' for buffers that do not override it.\n\ | |
1880 This is the same as (default-value 'truncate-lines)."); | |
1881 | |
1882 DEFVAR_LISP_NOPRO ("default-fill-column", | |
1883 &buffer_defaults.fill_column, | |
1884 "Default value of `fill-column' for buffers that do not override it.\n\ | |
1885 This is the same as (default-value 'fill-column)."); | |
1886 | |
1887 DEFVAR_LISP_NOPRO ("default-left-margin", | |
1888 &buffer_defaults.left_margin, | |
1889 "Default value of `left-margin' for buffers that do not override it.\n\ | |
1890 This is the same as (default-value 'left-margin)."); | |
1891 | |
1892 DEFVAR_LISP_NOPRO ("default-tab-width", | |
1893 &buffer_defaults.tab_width, | |
1894 "Default value of `tab-width' for buffers that do not override it.\n\ | |
1895 This is the same as (default-value 'tab-width)."); | |
1896 | |
1897 DEFVAR_LISP_NOPRO ("default-case-fold-search", | |
1898 &buffer_defaults.case_fold_search, | |
1899 "Default value of `case-fold-search' for buffers that don't override it.\n\ | |
1900 This is the same as (default-value 'case-fold-search)."); | |
1901 | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
1902 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
|
1903 Qnil, 0); |
333 | 1904 |
1905 /* This doc string is too long for cpp; cpp dies if it isn't in a comment. | |
1906 But make-docfile finds it! | |
1907 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
|
1908 Qnil, |
333 | 1909 "Template for displaying mode line for current buffer.\n\ |
1910 Each buffer has its own value of this variable.\n\ | |
1911 Value may be a string, a symbol or a list or cons cell.\n\ | |
1912 For a symbol, its value is used (but it is ignored if t or nil).\n\ | |
1913 A string appearing directly as the value of a symbol is processed verbatim\n\ | |
1914 in that the %-constructs below are not recognized.\n\ | |
1915 For a list whose car is a symbol, the symbol's value is taken,\n\ | |
1916 and if that is non-nil, the cadr of the list is processed recursively.\n\ | |
1917 Otherwise, the caddr of the list (if there is one) is processed.\n\ | |
1918 For a list whose car is a string or list, each element is processed\n\ | |
1919 recursively and the results are effectively concatenated.\n\ | |
1920 For a list whose car is an integer, the cdr of the list is processed\n\ | |
1921 and padded (if the number is positive) or truncated (if negative)\n\ | |
1922 to the width specified by that number.\n\ | |
1923 A string is printed verbatim in the mode line except for %-constructs:\n\ | |
1924 (%-constructs are allowed when the string is the entire mode-line-format\n\ | |
1925 or when it is found in a cons-cell or a list)\n\ | |
1926 %b -- print buffer name. %f -- print visited file name.\n\ | |
1927 %* -- 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
|
1928 %s -- print process status. %l -- print the current line number.\n\ |
333 | 1929 %p -- print percent of buffer above top of window, or top, bot or all.\n\ |
1930 %n -- print Narrow if appropriate.\n\ | |
1931 %[ -- print one [ for each recursive editing level. %] similar.\n\ | |
1932 %% -- print %. %- -- print infinitely many dashes.\n\ | |
1933 Decimal digits after the % specify field width to which to pad."); | |
1934 */ | |
1935 | |
1936 DEFVAR_LISP_NOPRO ("default-major-mode", &buffer_defaults.major_mode, | |
1937 "*Major mode for new buffers. Defaults to `fundamental-mode'.\n\ | |
1938 nil here means use current buffer's major mode."); | |
1939 | |
1940 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
|
1941 make_number (Lisp_Symbol), |
333 | 1942 "Symbol for current buffer's major mode."); |
1943 | |
1944 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
|
1945 make_number (Lisp_String), |
333 | 1946 "Pretty name of current buffer's major mode (a string)."); |
1947 | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
1948 DEFVAR_PER_BUFFER ("abbrev-mode", ¤t_buffer->abbrev_mode, Qnil, |
333 | 1949 "Non-nil turns on automatic expansion of abbrevs as they are inserted.\n\ |
1950 Automatically becomes buffer-local when set in any fashion."); | |
1951 | |
1952 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
|
1953 Qnil, |
333 | 1954 "*Non-nil if searches should ignore case.\n\ |
1955 Automatically becomes buffer-local when set in any fashion."); | |
1956 | |
1957 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
|
1958 make_number (Lisp_Int), |
333 | 1959 "*Column beyond which automatic line-wrapping should happen.\n\ |
1960 Automatically becomes buffer-local when set in any fashion."); | |
1961 | |
1962 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
|
1963 make_number (Lisp_Int), |
333 | 1964 "*Column for the default indent-line-function to indent to.\n\ |
1965 Linefeed indents to this column in Fundamental mode.\n\ | |
1966 Automatically becomes buffer-local when set in any fashion."); | |
1967 | |
1968 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
|
1969 make_number (Lisp_Int), |
333 | 1970 "*Distance between tab stops (for display of tab characters), in columns.\n\ |
1971 Automatically becomes buffer-local when set in any fashion."); | |
1972 | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
1973 DEFVAR_PER_BUFFER ("ctl-arrow", ¤t_buffer->ctl_arrow, Qnil, |
333 | 1974 "*Non-nil means display control chars with uparrow.\n\ |
1975 Nil means use backslash and octal digits.\n\ | |
1976 Automatically becomes buffer-local when set in any fashion.\n\ | |
1977 This variable does not apply to characters whose display is specified\n\ | |
1978 in the current display table (if there is one)."); | |
1979 | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
1980 DEFVAR_PER_BUFFER ("truncate-lines", ¤t_buffer->truncate_lines, Qnil, |
333 | 1981 "*Non-nil means do not display continuation lines;\n\ |
1982 give each line of text one screen line.\n\ | |
1983 Automatically becomes buffer-local when set in any fashion.\n\ | |
1984 \n\ | |
1985 Note that this is overridden by the variable\n\ | |
1986 `truncate-partial-width-windows' if that variable is non-nil\n\ | |
764 | 1987 and this buffer is not full-frame width."); |
333 | 1988 |
1989 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
|
1990 make_number (Lisp_String), |
333 | 1991 "Name of default directory of current buffer. Should end with slash.\n\ |
1992 Each buffer has its own value of this variable."); | |
1993 | |
1994 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
|
1995 Qnil, |
333 | 1996 "Function called (if non-nil) to perform auto-fill.\n\ |
1997 It is called after self-inserting a space at a column beyond `fill-column'.\n\ | |
1998 Each buffer has its own value of this variable.\n\ | |
1999 NOTE: This variable is not an ordinary hook;\n\ | |
2000 It may not be a list of functions."); | |
2001 | |
2002 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
|
2003 make_number (Lisp_String), |
333 | 2004 "Name of file visited in current buffer, or nil if not visiting a file.\n\ |
2005 Each buffer has its own value of this variable."); | |
2006 | |
2007 DEFVAR_PER_BUFFER ("buffer-auto-save-file-name", | |
1041 | 2008 ¤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
|
2009 make_number (Lisp_String), |
333 | 2010 "Name of file for auto-saving current buffer,\n\ |
2011 or nil if buffer should not be auto-saved.\n\ | |
2012 Each buffer has its own value of this variable."); | |
2013 | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2014 DEFVAR_PER_BUFFER ("buffer-read-only", ¤t_buffer->read_only, Qnil, |
333 | 2015 "Non-nil if this buffer is read-only.\n\ |
2016 Each buffer has its own value of this variable."); | |
2017 | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2018 DEFVAR_PER_BUFFER ("buffer-backed-up", ¤t_buffer->backed_up, Qnil, |
333 | 2019 "Non-nil if this buffer's file has been backed up.\n\ |
2020 Backing up is done before the first time the file is saved.\n\ | |
2021 Each buffer has its own value of this variable."); | |
2022 | |
2023 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
|
2024 make_number (Lisp_Int), |
333 | 2025 "Length of current buffer when last read in, saved or auto-saved.\n\ |
2026 0 initially.\n\ | |
2027 Each buffer has its own value of this variable."); | |
2028 | |
2029 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
|
2030 Qnil, |
333 | 2031 "Non-nil enables selective display:\n\ |
2032 Integer N as value means display only lines\n\ | |
2033 that start with less than n columns of space.\n\ | |
2034 A value of t means, after a ^M, all the rest of the line is invisible.\n\ | |
2035 Then ^M's in the file are written into files as newlines.\n\n\ | |
2036 Automatically becomes buffer-local when set in any fashion."); | |
2037 | |
2038 #ifndef old | |
2039 DEFVAR_PER_BUFFER ("selective-display-ellipses", | |
2040 ¤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
|
2041 Qnil, |
333 | 2042 "t means display ... on previous line when a line is invisible.\n\ |
2043 Automatically becomes buffer-local when set in any fashion."); | |
2044 #endif | |
2045 | |
1001
c1ebe69206df
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2046 DEFVAR_PER_BUFFER ("overwrite-mode", ¤t_buffer->overwrite_mode, Qnil, |
333 | 2047 "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
|
2048 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
|
2049 inserts at the end of a line, and inserts when point is before a tab,\n\ |
2217 | 2050 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
|
2051 If `overwrite-mode-binary', self-insertion replaces newlines and tabs too.\n\ |
333 | 2052 Automatically becomes buffer-local when set in any fashion."); |
2053 | |
2054 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
|
2055 Qnil, |
333 | 2056 "Display table that controls display of the contents of current buffer.\n\ |
2057 Automatically becomes buffer-local when set in any fashion.\n\ | |
2058 The display table is a vector created with `make-display-table'.\n\ | |
2059 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
|
2060 Each value should be a vector of characters or nil;\n\ |
333 | 2061 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
|
2062 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
|
2063 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
|
2064 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
|
2065 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
|
2066 (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
|
2067 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
|
2068 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
|
2069 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
|
2070 a vector of characters).\n\ |
333 | 2071 If this variable is nil, the value of `standard-display-table' is used.\n\ |
2072 Each window can have its own, overriding display table."); | |
2073 | |
2074 /*DEFVAR_LISP ("debug-check-symbol", &Vcheck_symbol, | |
2075 "Don't ask."); | |
2076 */ | |
392 | 2077 DEFVAR_LISP ("before-change-function", &Vbefore_change_function, |
333 | 2078 "Function to call before each text change.\n\ |
2079 Two arguments are passed to the function: the positions of\n\ | |
2080 the beginning and end of the range of old text to be changed.\n\ | |
2081 \(For an insertion, the beginning and end are at the same place.)\n\ | |
2082 No information is given about the length of the text after the change.\n\ | |
2083 position of the change\n\ | |
2084 \n\ | |
2085 While executing the `before-change-function', changes to buffers do not\n\ | |
2086 cause calls to any `before-change-function' or `after-change-function'."); | |
2087 Vbefore_change_function = Qnil; | |
2088 | |
2089 DEFVAR_LISP ("after-change-function", &Vafter_change_function, | |
2090 "Function to call after each text change.\n\ | |
2091 Three arguments are passed to the function: the positions of\n\ | |
2092 the beginning and end of the range of changed text,\n\ | |
2093 and the length of the pre-change text replaced by that range.\n\ | |
2094 \(For an insertion, the pre-change length is zero;\n\ | |
2095 for a deletion, that length is the number of characters deleted,\n\ | |
2096 and the post-change beginning and end are at the same place.)\n\ | |
2097 \n\ | |
2098 While executing the `after-change-function', changes to buffers do not\n\ | |
2099 cause calls to any `before-change-function' or `after-change-function'."); | |
2100 Vafter_change_function = Qnil; | |
2101 | |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
2102 DEFVAR_LISP ("first-change-hook", &Vfirst_change_hook, |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
2103 "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
|
2104 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
|
2105 Vfirst_change_hook = Qnil; |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
2106 Qfirst_change_hook = intern ("first-change-hook"); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1707
diff
changeset
|
2107 staticpro (&Qfirst_change_hook); |
333 | 2108 |
1041 | 2109 DEFVAR_PER_BUFFER ("buffer-undo-list", ¤t_buffer->undo_list, Qnil, |
333 | 2110 "List of undo entries in current buffer.\n\ |
2111 Recent changes come first; older changes follow newer.\n\ | |
2112 \n\ | |
2113 An entry (START . END) represents an insertion which begins at\n\ | |
2114 position START and ends at position END.\n\ | |
2115 \n\ | |
2116 An entry (TEXT . POSITION) represents the deletion of the string TEXT\n\ | |
2117 from (abs POSITION). If POSITION is positive, point was at the front\n\ | |
2118 of the text being deleted; if negative, point was at the end.\n\ | |
2119 \n\ | |
2120 An entry (t HIGHWORD LOWWORD) indicates that the buffer had been\n\ | |
2121 previously unmodified. HIGHWORD and LOWWORD are the high and low\n\ | |
2122 16-bit words of the buffer's modification count at the time. If the\n\ | |
2123 modification count of the most recent save is different, this entry is\n\ | |
2124 obsolete.\n\ | |
2125 \n\ | |
1952
b0ec61f76511
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
1909
diff
changeset
|
2126 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
|
2127 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
|
2128 and VAL is the old value.\n\ |
b0ec61f76511
(syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
1909
diff
changeset
|
2129 \n\ |
1985
666e3f26a8d6
* buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1953
diff
changeset
|
2130 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
|
2131 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
|
2132 point at POSITION.\n\ |
666e3f26a8d6
* buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1953
diff
changeset
|
2133 \n\ |
333 | 2134 nil marks undo boundaries. The undo command treats the changes\n\ |
2135 between two undo boundaries as a single step to be undone.\n\ | |
2136 \n\ | |
1985
666e3f26a8d6
* buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1953
diff
changeset
|
2137 If the value of the variable is t, undo information is not recorded."); |
333 | 2138 |
2043
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
2139 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
|
2140 "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
|
2141 Automatically local in all buffers."); |
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
2142 |
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
2143 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
|
2144 "*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
|
2145 Vtransient_mark_mode = Qnil; |
a1ab3501653c
(reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents:
2020
diff
changeset
|
2146 |
333 | 2147 defsubr (&Sbuffer_list); |
2148 defsubr (&Sget_buffer); | |
2149 defsubr (&Sget_file_buffer); | |
2150 defsubr (&Sget_buffer_create); | |
392 | 2151 defsubr (&Sgenerate_new_buffer_name); |
333 | 2152 defsubr (&Sbuffer_name); |
2153 /*defsubr (&Sbuffer_number);*/ | |
2154 defsubr (&Sbuffer_file_name); | |
2155 defsubr (&Sbuffer_local_variables); | |
2156 defsubr (&Sbuffer_modified_p); | |
2157 defsubr (&Sset_buffer_modified_p); | |
2158 defsubr (&Sbuffer_modified_tick); | |
2159 defsubr (&Srename_buffer); | |
2160 defsubr (&Sother_buffer); | |
2161 defsubr (&Sbuffer_disable_undo); | |
2162 defsubr (&Sbuffer_enable_undo); | |
2163 defsubr (&Skill_buffer); | |
2164 defsubr (&Serase_buffer); | |
2165 defsubr (&Sswitch_to_buffer); | |
2166 defsubr (&Spop_to_buffer); | |
2167 defsubr (&Scurrent_buffer); | |
2168 defsubr (&Sset_buffer); | |
2169 defsubr (&Sbarf_if_buffer_read_only); | |
2170 defsubr (&Sbury_buffer); | |
2171 defsubr (&Slist_buffers); | |
2172 defsubr (&Skill_all_local_variables); | |
2389
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2173 |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2174 defsubr (&Smake_overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2175 defsubr (&Sdelete_overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2176 defsubr (&Smove_overlay); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2177 defsubr (&Soverlays_at); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2178 defsubr (&Snext_overlay_change); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2179 defsubr (&Soverlay_recenter); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2180 defsubr (&Soverlay_lists); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2181 defsubr (&Soverlay_get); |
6048be0eedcd
(init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents:
2217
diff
changeset
|
2182 defsubr (&Soverlay_put); |
333 | 2183 } |
2184 | |
2185 keys_of_buffer () | |
2186 { | |
2187 initial_define_key (control_x_map, 'b', "switch-to-buffer"); | |
2188 initial_define_key (control_x_map, 'k', "kill-buffer"); | |
2189 initial_define_key (control_x_map, Ctl ('B'), "list-buffers"); | |
2190 } |