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