Commit | Line | Data |
---|---|---|
c6953be1 | 1 | /* undo handling for GNU Emacs. |
392e96d4 | 2 | Copyright (C) 1990, 1993, 1994, 2000 Free Software Foundation, Inc. |
c6953be1 JB |
3 | |
4 | This file is part of GNU Emacs. | |
5 | ||
3b7ad313 EN |
6 | GNU Emacs is free software; you can redistribute it and/or modify |
7 | it under the terms of the GNU General Public License as published by | |
8 | the Free Software Foundation; either version 2, or (at your option) | |
9 | any later version. | |
10 | ||
c6953be1 | 11 | GNU Emacs is distributed in the hope that it will be useful, |
3b7ad313 EN |
12 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 | GNU General Public License for more details. | |
15 | ||
16 | You should have received a copy of the GNU General Public License | |
17 | along with GNU Emacs; see the file COPYING. If not, write to | |
18 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
19 | Boston, MA 02111-1307, USA. */ | |
c6953be1 JB |
20 | |
21 | ||
18160b98 | 22 | #include <config.h> |
c6953be1 JB |
23 | #include "lisp.h" |
24 | #include "buffer.h" | |
4e665715 | 25 | #include "commands.h" |
c6953be1 JB |
26 | |
27 | /* Last buffer for which undo information was recorded. */ | |
28 | Lisp_Object last_undo_buffer; | |
29 | ||
f87a68b3 RS |
30 | Lisp_Object Qinhibit_read_only; |
31 | ||
c58632fc RS |
32 | /* The first time a command records something for undo. |
33 | it also allocates the undo-boundary object | |
34 | which will be added to the list at the end of the command. | |
35 | This ensures we can't run out of space while trying to make | |
36 | an undo-boundary. */ | |
37 | Lisp_Object pending_boundary; | |
38 | ||
6396140a SM |
39 | /* Record point as it was at beginning of this command (if necessary) |
40 | And prepare the undo info for recording a change. | |
41 | PT is the position of point that will naturally occur as a result of the | |
42 | undo record that will be added just after this command terminates. */ | |
c6953be1 | 43 | |
6396140a SM |
44 | static void |
45 | record_point (pt) | |
f45bedd4 | 46 | int pt; |
c6953be1 | 47 | { |
6396140a | 48 | int at_boundary; |
bdbe6f28 | 49 | |
c58632fc RS |
50 | /* Allocate a cons cell to be the undo boundary after this command. */ |
51 | if (NILP (pending_boundary)) | |
52 | pending_boundary = Fcons (Qnil, Qnil); | |
53 | ||
8801a864 KR |
54 | if (!BUFFERP (last_undo_buffer) |
55 | || current_buffer != XBUFFER (last_undo_buffer)) | |
c6953be1 | 56 | Fundo_boundary (); |
552bdbcf | 57 | XSETBUFFER (last_undo_buffer, current_buffer); |
c6953be1 | 58 | |
6396140a SM |
59 | if (CONSP (current_buffer->undo_list)) |
60 | { | |
61 | /* Set AT_BOUNDARY to 1 only when we have nothing other than | |
62 | marker adjustment before undo boundary. */ | |
63 | ||
64 | Lisp_Object tail = current_buffer->undo_list, elt; | |
65 | ||
66 | while (1) | |
67 | { | |
68 | if (NILP (tail)) | |
69 | elt = Qnil; | |
70 | else | |
71 | elt = XCAR (tail); | |
72 | if (NILP (elt) || ! (CONSP (elt) && MARKERP (XCAR (elt)))) | |
73 | break; | |
74 | tail = XCDR (tail); | |
75 | } | |
76 | at_boundary = NILP (elt); | |
77 | } | |
78 | else | |
79 | at_boundary = 1; | |
80 | ||
ad9cdce4 | 81 | if (MODIFF <= SAVE_MODIFF) |
c6953be1 JB |
82 | record_first_change (); |
83 | ||
6396140a SM |
84 | /* If we are just after an undo boundary, and |
85 | point wasn't at start of deleted range, record where it was. */ | |
86 | if (at_boundary | |
87 | && last_point_position != pt | |
88 | /* If we're called from batch mode, this could be nil. */ | |
89 | && BUFFERP (last_point_position_buffer) | |
90 | && current_buffer == XBUFFER (last_point_position_buffer)) | |
91 | current_buffer->undo_list | |
92 | = Fcons (make_number (last_point_position), current_buffer->undo_list); | |
93 | } | |
94 | ||
95 | /* Record an insertion that just happened or is about to happen, | |
96 | for LENGTH characters at position BEG. | |
97 | (It is possible to record an insertion before or after the fact | |
98 | because we don't need to record the contents.) */ | |
99 | ||
100 | void | |
101 | record_insert (beg, length) | |
102 | int beg, length; | |
103 | { | |
104 | Lisp_Object lbeg, lend; | |
105 | ||
106 | if (EQ (current_buffer->undo_list, Qt)) | |
107 | return; | |
108 | ||
109 | record_point (beg); | |
110 | ||
c6953be1 JB |
111 | /* If this is following another insertion and consecutive with it |
112 | in the buffer, combine the two. */ | |
38c0d37c | 113 | if (CONSP (current_buffer->undo_list)) |
c6953be1 JB |
114 | { |
115 | Lisp_Object elt; | |
c1d497be | 116 | elt = XCAR (current_buffer->undo_list); |
38c0d37c | 117 | if (CONSP (elt) |
c1d497be KR |
118 | && INTEGERP (XCAR (elt)) |
119 | && INTEGERP (XCDR (elt)) | |
120 | && XINT (XCDR (elt)) == beg) | |
c6953be1 | 121 | { |
f3fbd155 | 122 | XSETCDR (elt, make_number (beg + length)); |
c6953be1 JB |
123 | return; |
124 | } | |
125 | } | |
126 | ||
53480e99 KH |
127 | XSETFASTINT (lbeg, beg); |
128 | XSETINT (lend, beg + length); | |
213861c7 JB |
129 | current_buffer->undo_list = Fcons (Fcons (lbeg, lend), |
130 | current_buffer->undo_list); | |
c6953be1 JB |
131 | } |
132 | ||
133 | /* Record that a deletion is about to take place, | |
e928d437 | 134 | of the characters in STRING, at location BEG. */ |
c6953be1 | 135 | |
ff1aa840 | 136 | void |
e928d437 RS |
137 | record_delete (beg, string) |
138 | int beg; | |
139 | Lisp_Object string; | |
c6953be1 | 140 | { |
e928d437 | 141 | Lisp_Object sbeg; |
c6953be1 | 142 | |
bdbe6f28 RS |
143 | if (EQ (current_buffer->undo_list, Qt)) |
144 | return; | |
145 | ||
d5db4077 | 146 | if (PT == beg + SCHARS (string)) |
cbc1b668 | 147 | { |
6396140a SM |
148 | XSETINT (sbeg, -beg); |
149 | record_point (PT); | |
cbc1b668 KH |
150 | } |
151 | else | |
6396140a SM |
152 | { |
153 | XSETFASTINT (sbeg, beg); | |
154 | record_point (beg); | |
155 | } | |
350bce56 | 156 | |
c6953be1 | 157 | current_buffer->undo_list |
e928d437 | 158 | = Fcons (Fcons (string, sbeg), current_buffer->undo_list); |
c6953be1 JB |
159 | } |
160 | ||
714bced9 RS |
161 | /* Record the fact that MARKER is about to be adjusted by ADJUSTMENT. |
162 | This is done only when a marker points within text being deleted, | |
163 | because that's the only case where an automatic marker adjustment | |
164 | won't be inverted automatically by undoing the buffer modification. */ | |
165 | ||
ff1aa840 | 166 | void |
714bced9 RS |
167 | record_marker_adjustment (marker, adjustment) |
168 | Lisp_Object marker; | |
169 | int adjustment; | |
170 | { | |
171 | if (EQ (current_buffer->undo_list, Qt)) | |
172 | return; | |
173 | ||
174 | /* Allocate a cons cell to be the undo boundary after this command. */ | |
175 | if (NILP (pending_boundary)) | |
176 | pending_boundary = Fcons (Qnil, Qnil); | |
177 | ||
2f33f38a GM |
178 | if (!BUFFERP (last_undo_buffer) |
179 | || current_buffer != XBUFFER (last_undo_buffer)) | |
714bced9 RS |
180 | Fundo_boundary (); |
181 | XSETBUFFER (last_undo_buffer, current_buffer); | |
182 | ||
183 | current_buffer->undo_list | |
184 | = Fcons (Fcons (marker, make_number (adjustment)), | |
185 | current_buffer->undo_list); | |
186 | } | |
187 | ||
c6953be1 JB |
188 | /* Record that a replacement is about to take place, |
189 | for LENGTH characters at location BEG. | |
e928d437 | 190 | The replacement must not change the number of characters. */ |
c6953be1 | 191 | |
ff1aa840 | 192 | void |
c6953be1 JB |
193 | record_change (beg, length) |
194 | int beg, length; | |
195 | { | |
e928d437 | 196 | record_delete (beg, make_buffer_string (beg, beg + length, 1)); |
c6953be1 JB |
197 | record_insert (beg, length); |
198 | } | |
199 | \f | |
200 | /* Record that an unmodified buffer is about to be changed. | |
201 | Record the file modification date so that when undoing this entry | |
202 | we can tell whether it is obsolete because the file was saved again. */ | |
203 | ||
90dd3e4f | 204 | void |
c6953be1 JB |
205 | record_first_change () |
206 | { | |
207 | Lisp_Object high, low; | |
ad9cdce4 | 208 | struct buffer *base_buffer = current_buffer; |
0736cafe RS |
209 | |
210 | if (EQ (current_buffer->undo_list, Qt)) | |
211 | return; | |
212 | ||
2f33f38a GM |
213 | if (!BUFFERP (last_undo_buffer) |
214 | || current_buffer != XBUFFER (last_undo_buffer)) | |
0736cafe | 215 | Fundo_boundary (); |
552bdbcf | 216 | XSETBUFFER (last_undo_buffer, current_buffer); |
0736cafe | 217 | |
ad9cdce4 RS |
218 | if (base_buffer->base_buffer) |
219 | base_buffer = base_buffer->base_buffer; | |
220 | ||
221 | XSETFASTINT (high, (base_buffer->modtime >> 16) & 0xffff); | |
222 | XSETFASTINT (low, base_buffer->modtime & 0xffff); | |
c6953be1 JB |
223 | current_buffer->undo_list = Fcons (Fcons (Qt, Fcons (high, low)), current_buffer->undo_list); |
224 | } | |
225 | ||
da9319d5 RS |
226 | /* Record a change in property PROP (whose old value was VAL) |
227 | for LENGTH characters starting at position BEG in BUFFER. */ | |
228 | ||
90dd3e4f | 229 | void |
da9319d5 RS |
230 | record_property_change (beg, length, prop, value, buffer) |
231 | int beg, length; | |
232 | Lisp_Object prop, value, buffer; | |
233 | { | |
234 | Lisp_Object lbeg, lend, entry; | |
235 | struct buffer *obuf = current_buffer; | |
236 | int boundary = 0; | |
237 | ||
0736cafe | 238 | if (EQ (XBUFFER (buffer)->undo_list, Qt)) |
bdbe6f28 RS |
239 | return; |
240 | ||
c58632fc RS |
241 | /* Allocate a cons cell to be the undo boundary after this command. */ |
242 | if (NILP (pending_boundary)) | |
243 | pending_boundary = Fcons (Qnil, Qnil); | |
244 | ||
da9319d5 RS |
245 | if (!EQ (buffer, last_undo_buffer)) |
246 | boundary = 1; | |
247 | last_undo_buffer = buffer; | |
248 | ||
da9319d5 RS |
249 | /* Switch temporarily to the buffer that was changed. */ |
250 | current_buffer = XBUFFER (buffer); | |
251 | ||
252 | if (boundary) | |
253 | Fundo_boundary (); | |
254 | ||
ad9cdce4 | 255 | if (MODIFF <= SAVE_MODIFF) |
da9319d5 RS |
256 | record_first_change (); |
257 | ||
552bdbcf KH |
258 | XSETINT (lbeg, beg); |
259 | XSETINT (lend, beg + length); | |
da9319d5 RS |
260 | entry = Fcons (Qnil, Fcons (prop, Fcons (value, Fcons (lbeg, lend)))); |
261 | current_buffer->undo_list = Fcons (entry, current_buffer->undo_list); | |
262 | ||
263 | current_buffer = obuf; | |
264 | } | |
265 | ||
c6953be1 | 266 | DEFUN ("undo-boundary", Fundo_boundary, Sundo_boundary, 0, 0, 0, |
8c1a1077 PJ |
267 | doc: /* Mark a boundary between units of undo. |
268 | An undo command will stop at this point, | |
269 | but another undo command will undo to the previous boundary. */) | |
270 | () | |
c6953be1 JB |
271 | { |
272 | Lisp_Object tem; | |
273 | if (EQ (current_buffer->undo_list, Qt)) | |
274 | return Qnil; | |
275 | tem = Fcar (current_buffer->undo_list); | |
265a9e55 | 276 | if (!NILP (tem)) |
c58632fc RS |
277 | { |
278 | /* One way or another, cons nil onto the front of the undo list. */ | |
279 | if (!NILP (pending_boundary)) | |
280 | { | |
281 | /* If we have preallocated the cons cell to use here, | |
282 | use that one. */ | |
f3fbd155 | 283 | XSETCDR (pending_boundary, current_buffer->undo_list); |
c58632fc RS |
284 | current_buffer->undo_list = pending_boundary; |
285 | pending_boundary = Qnil; | |
286 | } | |
287 | else | |
288 | current_buffer->undo_list = Fcons (Qnil, current_buffer->undo_list); | |
289 | } | |
c6953be1 JB |
290 | return Qnil; |
291 | } | |
292 | ||
293 | /* At garbage collection time, make an undo list shorter at the end, | |
294 | returning the truncated list. | |
295 | MINSIZE and MAXSIZE are the limits on size allowed, as described below. | |
f06cd136 JB |
296 | In practice, these are the values of undo-limit and |
297 | undo-strong-limit. */ | |
c6953be1 JB |
298 | |
299 | Lisp_Object | |
300 | truncate_undo_list (list, minsize, maxsize) | |
301 | Lisp_Object list; | |
302 | int minsize, maxsize; | |
303 | { | |
304 | Lisp_Object prev, next, last_boundary; | |
305 | int size_so_far = 0; | |
306 | ||
307 | prev = Qnil; | |
308 | next = list; | |
309 | last_boundary = Qnil; | |
310 | ||
311 | /* Always preserve at least the most recent undo record. | |
181a18b1 JB |
312 | If the first element is an undo boundary, skip past it. |
313 | ||
314 | Skip, skip, skip the undo, skip, skip, skip the undo, | |
07627b5d JB |
315 | Skip, skip, skip the undo, skip to the undo bound'ry. |
316 | (Get it? "Skip to my Loo?") */ | |
c1d497be | 317 | if (CONSP (next) && NILP (XCAR (next))) |
c6953be1 JB |
318 | { |
319 | /* Add in the space occupied by this element and its chain link. */ | |
320 | size_so_far += sizeof (struct Lisp_Cons); | |
321 | ||
322 | /* Advance to next element. */ | |
323 | prev = next; | |
c1d497be | 324 | next = XCDR (next); |
c6953be1 | 325 | } |
c1d497be | 326 | while (CONSP (next) && ! NILP (XCAR (next))) |
c6953be1 JB |
327 | { |
328 | Lisp_Object elt; | |
c1d497be | 329 | elt = XCAR (next); |
c6953be1 JB |
330 | |
331 | /* Add in the space occupied by this element and its chain link. */ | |
332 | size_so_far += sizeof (struct Lisp_Cons); | |
38c0d37c | 333 | if (CONSP (elt)) |
c6953be1 JB |
334 | { |
335 | size_so_far += sizeof (struct Lisp_Cons); | |
c1d497be | 336 | if (STRINGP (XCAR (elt))) |
c6953be1 | 337 | size_so_far += (sizeof (struct Lisp_String) - 1 |
d5db4077 | 338 | + SCHARS (XCAR (elt))); |
c6953be1 JB |
339 | } |
340 | ||
341 | /* Advance to next element. */ | |
342 | prev = next; | |
c1d497be | 343 | next = XCDR (next); |
c6953be1 | 344 | } |
38c0d37c | 345 | if (CONSP (next)) |
c6953be1 JB |
346 | last_boundary = prev; |
347 | ||
38c0d37c | 348 | while (CONSP (next)) |
c6953be1 JB |
349 | { |
350 | Lisp_Object elt; | |
c1d497be | 351 | elt = XCAR (next); |
c6953be1 JB |
352 | |
353 | /* When we get to a boundary, decide whether to truncate | |
354 | either before or after it. The lower threshold, MINSIZE, | |
355 | tells us to truncate after it. If its size pushes past | |
356 | the higher threshold MAXSIZE as well, we truncate before it. */ | |
265a9e55 | 357 | if (NILP (elt)) |
c6953be1 JB |
358 | { |
359 | if (size_so_far > maxsize) | |
360 | break; | |
361 | last_boundary = prev; | |
362 | if (size_so_far > minsize) | |
363 | break; | |
364 | } | |
365 | ||
366 | /* Add in the space occupied by this element and its chain link. */ | |
367 | size_so_far += sizeof (struct Lisp_Cons); | |
38c0d37c | 368 | if (CONSP (elt)) |
c6953be1 JB |
369 | { |
370 | size_so_far += sizeof (struct Lisp_Cons); | |
c1d497be | 371 | if (STRINGP (XCAR (elt))) |
c6953be1 | 372 | size_so_far += (sizeof (struct Lisp_String) - 1 |
d5db4077 | 373 | + SCHARS (XCAR (elt))); |
c6953be1 JB |
374 | } |
375 | ||
376 | /* Advance to next element. */ | |
377 | prev = next; | |
c1d497be | 378 | next = XCDR (next); |
c6953be1 JB |
379 | } |
380 | ||
381 | /* If we scanned the whole list, it is short enough; don't change it. */ | |
265a9e55 | 382 | if (NILP (next)) |
c6953be1 JB |
383 | return list; |
384 | ||
385 | /* Truncate at the boundary where we decided to truncate. */ | |
265a9e55 | 386 | if (!NILP (last_boundary)) |
c6953be1 | 387 | { |
f3fbd155 | 388 | XSETCDR (last_boundary, Qnil); |
c6953be1 JB |
389 | return list; |
390 | } | |
391 | else | |
392 | return Qnil; | |
393 | } | |
394 | \f | |
395 | DEFUN ("primitive-undo", Fprimitive_undo, Sprimitive_undo, 2, 2, 0, | |
8c1a1077 PJ |
396 | doc: /* Undo N records from the front of the list LIST. |
397 | Return what remains of the list. */) | |
398 | (n, list) | |
063fb61f | 399 | Lisp_Object n, list; |
c6953be1 | 400 | { |
de65837b KH |
401 | struct gcpro gcpro1, gcpro2; |
402 | Lisp_Object next; | |
331379bf | 403 | int count = SPECPDL_INDEX (); |
de65837b | 404 | register int arg; |
8c757fd7 | 405 | |
c6953be1 JB |
406 | #if 0 /* This is a good feature, but would make undo-start |
407 | unable to do what is expected. */ | |
408 | Lisp_Object tem; | |
409 | ||
410 | /* If the head of the list is a boundary, it is the boundary | |
411 | preceding this command. Get rid of it and don't count it. */ | |
412 | tem = Fcar (list); | |
265a9e55 | 413 | if (NILP (tem)) |
c6953be1 JB |
414 | list = Fcdr (list); |
415 | #endif | |
416 | ||
b7826503 | 417 | CHECK_NUMBER (n); |
de65837b KH |
418 | arg = XINT (n); |
419 | next = Qnil; | |
420 | GCPRO2 (next, list); | |
421 | ||
38d56be3 GM |
422 | /* In a writable buffer, enable undoing read-only text that is so |
423 | because of text properties. */ | |
424 | if (NILP (current_buffer->read_only)) | |
f87a68b3 RS |
425 | specbind (Qinhibit_read_only, Qt); |
426 | ||
8c757fd7 GM |
427 | /* Don't let `intangible' properties interfere with undo. */ |
428 | specbind (Qinhibit_point_motion_hooks, Qt); | |
429 | ||
c6953be1 JB |
430 | while (arg > 0) |
431 | { | |
c3b09bbf | 432 | while (CONSP (list)) |
c6953be1 | 433 | { |
c3b09bbf SM |
434 | next = XCAR (list); |
435 | list = XCDR (list); | |
350bce56 | 436 | /* Exit inner loop at undo boundary. */ |
265a9e55 | 437 | if (NILP (next)) |
c6953be1 | 438 | break; |
350bce56 | 439 | /* Handle an integer by setting point to that value. */ |
38c0d37c | 440 | if (INTEGERP (next)) |
350bce56 | 441 | SET_PT (clip_to_bounds (BEGV, XINT (next), ZV)); |
38c0d37c | 442 | else if (CONSP (next)) |
c6953be1 | 443 | { |
350bce56 RS |
444 | Lisp_Object car, cdr; |
445 | ||
c3b09bbf SM |
446 | car = XCAR (next); |
447 | cdr = XCDR (next); | |
350bce56 | 448 | if (EQ (car, Qt)) |
c6953be1 | 449 | { |
350bce56 RS |
450 | /* Element (t high . low) records previous modtime. */ |
451 | Lisp_Object high, low; | |
452 | int mod_time; | |
ad9cdce4 | 453 | struct buffer *base_buffer = current_buffer; |
350bce56 RS |
454 | |
455 | high = Fcar (cdr); | |
456 | low = Fcdr (cdr); | |
d8552b2f | 457 | mod_time = (XFASTINT (high) << 16) + XFASTINT (low); |
ad9cdce4 RS |
458 | |
459 | if (current_buffer->base_buffer) | |
460 | base_buffer = current_buffer->base_buffer; | |
461 | ||
350bce56 RS |
462 | /* If this records an obsolete save |
463 | (not matching the actual disk file) | |
464 | then don't mark unmodified. */ | |
ad9cdce4 | 465 | if (mod_time != base_buffer->modtime) |
103dcb38 | 466 | continue; |
e6dd6080 | 467 | #ifdef CLASH_DETECTION |
350bce56 | 468 | Funlock_buffer (); |
e6dd6080 | 469 | #endif /* CLASH_DETECTION */ |
350bce56 | 470 | Fset_buffer_modified_p (Qnil); |
c6953be1 | 471 | } |
d8552b2f | 472 | else if (EQ (car, Qnil)) |
da9319d5 | 473 | { |
d8552b2f | 474 | /* Element (nil prop val beg . end) is property change. */ |
da9319d5 RS |
475 | Lisp_Object beg, end, prop, val; |
476 | ||
477 | prop = Fcar (cdr); | |
478 | cdr = Fcdr (cdr); | |
479 | val = Fcar (cdr); | |
480 | cdr = Fcdr (cdr); | |
481 | beg = Fcar (cdr); | |
482 | end = Fcdr (cdr); | |
483 | ||
484 | Fput_text_property (beg, end, prop, val, Qnil); | |
485 | } | |
38c0d37c | 486 | else if (INTEGERP (car) && INTEGERP (cdr)) |
c6953be1 | 487 | { |
350bce56 | 488 | /* Element (BEG . END) means range was inserted. */ |
350bce56 RS |
489 | |
490 | if (XINT (car) < BEGV | |
491 | || XINT (cdr) > ZV) | |
c6953be1 | 492 | error ("Changes to be undone are outside visible portion of buffer"); |
f28f04cc RS |
493 | /* Set point first thing, so that undoing this undo |
494 | does not send point back to where it is now. */ | |
350bce56 | 495 | Fgoto_char (car); |
f28f04cc | 496 | Fdelete_region (car, cdr); |
350bce56 | 497 | } |
38c0d37c | 498 | else if (STRINGP (car) && INTEGERP (cdr)) |
350bce56 RS |
499 | { |
500 | /* Element (STRING . POS) means STRING was deleted. */ | |
501 | Lisp_Object membuf; | |
502 | int pos = XINT (cdr); | |
503 | ||
504 | membuf = car; | |
505 | if (pos < 0) | |
506 | { | |
507 | if (-pos < BEGV || -pos > ZV) | |
508 | error ("Changes to be undone are outside visible portion of buffer"); | |
509 | SET_PT (-pos); | |
510 | Finsert (1, &membuf); | |
511 | } | |
512 | else | |
513 | { | |
514 | if (pos < BEGV || pos > ZV) | |
515 | error ("Changes to be undone are outside visible portion of buffer"); | |
516 | SET_PT (pos); | |
517 | ||
b2adc409 RS |
518 | /* Now that we record marker adjustments |
519 | (caused by deletion) for undo, | |
520 | we should always insert after markers, | |
521 | so that undoing the marker adjustments | |
522 | put the markers back in the right place. */ | |
523 | Finsert (1, &membuf); | |
350bce56 RS |
524 | SET_PT (pos); |
525 | } | |
c6953be1 | 526 | } |
714bced9 RS |
527 | else if (MARKERP (car) && INTEGERP (cdr)) |
528 | { | |
529 | /* (MARKER . INTEGER) means a marker MARKER | |
530 | was adjusted by INTEGER. */ | |
531 | if (XMARKER (car)->buffer) | |
532 | Fset_marker (car, | |
533 | make_number (marker_position (car) - XINT (cdr)), | |
534 | Fmarker_buffer (car)); | |
535 | } | |
c6953be1 JB |
536 | } |
537 | } | |
538 | arg--; | |
539 | } | |
540 | ||
de65837b | 541 | UNGCPRO; |
f87a68b3 | 542 | return unbind_to (count, list); |
c6953be1 JB |
543 | } |
544 | ||
dfcf069d | 545 | void |
c6953be1 JB |
546 | syms_of_undo () |
547 | { | |
f87a68b3 RS |
548 | Qinhibit_read_only = intern ("inhibit-read-only"); |
549 | staticpro (&Qinhibit_read_only); | |
550 | ||
c58632fc RS |
551 | pending_boundary = Qnil; |
552 | staticpro (&pending_boundary); | |
553 | ||
c6953be1 JB |
554 | defsubr (&Sprimitive_undo); |
555 | defsubr (&Sundo_boundary); | |
556 | } |