Mercurial > emacs
annotate src/undo.c @ 6180:d369907be635
(record_delete): Save last_point_position in the undo record, rather than the
current value of point.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Thu, 03 Mar 1994 20:12:01 +0000 |
| parents | 099857a46901 |
| children | a147d798ed0d |
| rev | line source |
|---|---|
| 223 | 1 /* undo handling for GNU Emacs. |
| 2961 | 2 Copyright (C) 1990, 1993 Free Software Foundation, Inc. |
| 223 | 3 |
| 4 This file is part of GNU Emacs. | |
| 5 | |
| 6 GNU Emacs is distributed in the hope that it will be useful, | |
| 7 but WITHOUT ANY WARRANTY. No author or distributor | |
| 8 accepts responsibility to anyone for the consequences of using it | |
| 9 or for whether it serves any particular purpose or works at all, | |
| 10 unless he says so in writing. Refer to the GNU Emacs General Public | |
| 11 License for full details. | |
| 12 | |
| 13 Everyone is granted permission to copy, modify and redistribute | |
| 14 GNU Emacs, but only under the conditions described in the | |
| 15 GNU Emacs General Public License. A copy of this license is | |
| 16 supposed to have been given to you along with GNU Emacs so you | |
| 17 can know your rights and responsibilities. It should be in a | |
| 18 file named COPYING. Among other things, the copyright notice | |
| 19 and this notice must be preserved on all copies. */ | |
| 20 | |
| 21 | |
|
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
3719
diff
changeset
|
22 #include <config.h> |
| 223 | 23 #include "lisp.h" |
| 24 #include "buffer.h" | |
|
6180
d369907be635
(record_delete): Save last_point_position in the undo record, rather than the
Karl Heuer <kwzh@gnu.org>
parents:
5762
diff
changeset
|
25 #include "commands.h" |
| 223 | 26 |
| 27 /* Last buffer for which undo information was recorded. */ | |
| 28 Lisp_Object last_undo_buffer; | |
| 29 | |
|
3696
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
30 Lisp_Object Qinhibit_read_only; |
|
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
31 |
| 223 | 32 /* Record an insertion that just happened or is about to happen, |
| 33 for LENGTH characters at position BEG. | |
| 34 (It is possible to record an insertion before or after the fact | |
| 35 because we don't need to record the contents.) */ | |
| 36 | |
| 37 record_insert (beg, length) | |
| 38 Lisp_Object beg, length; | |
| 39 { | |
| 40 Lisp_Object lbeg, lend; | |
| 41 | |
|
2194
886a69457557
(record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents:
1968
diff
changeset
|
42 if (EQ (current_buffer->undo_list, Qt)) |
|
886a69457557
(record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents:
1968
diff
changeset
|
43 return; |
|
886a69457557
(record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents:
1968
diff
changeset
|
44 |
| 223 | 45 if (current_buffer != XBUFFER (last_undo_buffer)) |
| 46 Fundo_boundary (); | |
| 47 XSET (last_undo_buffer, Lisp_Buffer, current_buffer); | |
| 48 | |
| 49 if (MODIFF <= current_buffer->save_modified) | |
| 50 record_first_change (); | |
| 51 | |
| 52 /* If this is following another insertion and consecutive with it | |
| 53 in the buffer, combine the two. */ | |
| 54 if (XTYPE (current_buffer->undo_list) == Lisp_Cons) | |
| 55 { | |
| 56 Lisp_Object elt; | |
| 57 elt = XCONS (current_buffer->undo_list)->car; | |
| 58 if (XTYPE (elt) == Lisp_Cons | |
| 59 && XTYPE (XCONS (elt)->car) == Lisp_Int | |
| 60 && XTYPE (XCONS (elt)->cdr) == Lisp_Int | |
|
1524
91454bf15944
* undo.c (record_insert): Use accessors on BEG and LENGTH.
Jim Blandy <jimb@redhat.com>
parents:
1320
diff
changeset
|
61 && XINT (XCONS (elt)->cdr) == XINT (beg)) |
| 223 | 62 { |
|
1524
91454bf15944
* undo.c (record_insert): Use accessors on BEG and LENGTH.
Jim Blandy <jimb@redhat.com>
parents:
1320
diff
changeset
|
63 XSETINT (XCONS (elt)->cdr, XINT (beg) + XINT (length)); |
| 223 | 64 return; |
| 65 } | |
| 66 } | |
| 67 | |
|
1524
91454bf15944
* undo.c (record_insert): Use accessors on BEG and LENGTH.
Jim Blandy <jimb@redhat.com>
parents:
1320
diff
changeset
|
68 lbeg = beg; |
|
91454bf15944
* undo.c (record_insert): Use accessors on BEG and LENGTH.
Jim Blandy <jimb@redhat.com>
parents:
1320
diff
changeset
|
69 XSET (lend, Lisp_Int, XINT (beg) + XINT (length)); |
|
91454bf15944
* undo.c (record_insert): Use accessors on BEG and LENGTH.
Jim Blandy <jimb@redhat.com>
parents:
1320
diff
changeset
|
70 current_buffer->undo_list = Fcons (Fcons (lbeg, lend), |
|
91454bf15944
* undo.c (record_insert): Use accessors on BEG and LENGTH.
Jim Blandy <jimb@redhat.com>
parents:
1320
diff
changeset
|
71 current_buffer->undo_list); |
| 223 | 72 } |
| 73 | |
| 74 /* Record that a deletion is about to take place, | |
| 75 for LENGTH characters at location BEG. */ | |
| 76 | |
| 77 record_delete (beg, length) | |
| 78 int beg, length; | |
| 79 { | |
| 80 Lisp_Object lbeg, lend, sbeg; | |
| 81 | |
|
2194
886a69457557
(record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents:
1968
diff
changeset
|
82 if (EQ (current_buffer->undo_list, Qt)) |
|
886a69457557
(record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents:
1968
diff
changeset
|
83 return; |
|
886a69457557
(record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents:
1968
diff
changeset
|
84 |
| 223 | 85 if (current_buffer != XBUFFER (last_undo_buffer)) |
| 86 Fundo_boundary (); | |
| 87 XSET (last_undo_buffer, Lisp_Buffer, current_buffer); | |
| 88 | |
| 89 if (MODIFF <= current_buffer->save_modified) | |
| 90 record_first_change (); | |
| 91 | |
| 92 if (point == beg + length) | |
| 93 XSET (sbeg, Lisp_Int, -beg); | |
| 94 else | |
| 95 XFASTINT (sbeg) = beg; | |
| 96 XFASTINT (lbeg) = beg; | |
| 97 XFASTINT (lend) = beg + length; | |
|
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
98 |
|
6180
d369907be635
(record_delete): Save last_point_position in the undo record, rather than the
Karl Heuer <kwzh@gnu.org>
parents:
5762
diff
changeset
|
99 /* If point wasn't at start of deleted range, record where it was. */ |
|
d369907be635
(record_delete): Save last_point_position in the undo record, rather than the
Karl Heuer <kwzh@gnu.org>
parents:
5762
diff
changeset
|
100 if (last_point_position != XFASTINT (sbeg)) |
|
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
101 current_buffer->undo_list |
|
6180
d369907be635
(record_delete): Save last_point_position in the undo record, rather than the
Karl Heuer <kwzh@gnu.org>
parents:
5762
diff
changeset
|
102 = Fcons (make_number (last_point_position), current_buffer->undo_list); |
|
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
103 |
| 223 | 104 current_buffer->undo_list |
| 105 = Fcons (Fcons (Fbuffer_substring (lbeg, lend), sbeg), | |
| 106 current_buffer->undo_list); | |
| 107 } | |
| 108 | |
| 109 /* Record that a replacement is about to take place, | |
| 110 for LENGTH characters at location BEG. | |
| 111 The replacement does not change the number of characters. */ | |
| 112 | |
| 113 record_change (beg, length) | |
| 114 int beg, length; | |
| 115 { | |
| 116 record_delete (beg, length); | |
| 117 record_insert (beg, length); | |
| 118 } | |
| 119 | |
| 120 /* Record that an unmodified buffer is about to be changed. | |
| 121 Record the file modification date so that when undoing this entry | |
| 122 we can tell whether it is obsolete because the file was saved again. */ | |
| 123 | |
| 124 record_first_change () | |
| 125 { | |
| 126 Lisp_Object high, low; | |
|
5762
099857a46901
(record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
127 |
|
099857a46901
(record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
128 if (EQ (current_buffer->undo_list, Qt)) |
|
099857a46901
(record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
129 return; |
|
099857a46901
(record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
130 |
|
099857a46901
(record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
131 if (current_buffer != XBUFFER (last_undo_buffer)) |
|
099857a46901
(record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
132 Fundo_boundary (); |
|
099857a46901
(record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
133 XSET (last_undo_buffer, Lisp_Buffer, current_buffer); |
|
099857a46901
(record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
134 |
| 223 | 135 XFASTINT (high) = (current_buffer->modtime >> 16) & 0xffff; |
| 136 XFASTINT (low) = current_buffer->modtime & 0xffff; | |
| 137 current_buffer->undo_list = Fcons (Fcons (Qt, Fcons (high, low)), current_buffer->undo_list); | |
| 138 } | |
| 139 | |
|
1968
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
140 /* Record a change in property PROP (whose old value was VAL) |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
141 for LENGTH characters starting at position BEG in BUFFER. */ |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
142 |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
143 record_property_change (beg, length, prop, value, buffer) |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
144 int beg, length; |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
145 Lisp_Object prop, value, buffer; |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
146 { |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
147 Lisp_Object lbeg, lend, entry; |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
148 struct buffer *obuf = current_buffer; |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
149 int boundary = 0; |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
150 |
|
5762
099857a46901
(record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
151 if (EQ (XBUFFER (buffer)->undo_list, Qt)) |
|
2194
886a69457557
(record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents:
1968
diff
changeset
|
152 return; |
|
886a69457557
(record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents:
1968
diff
changeset
|
153 |
|
1968
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
154 if (!EQ (buffer, last_undo_buffer)) |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
155 boundary = 1; |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
156 last_undo_buffer = buffer; |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
157 |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
158 /* Switch temporarily to the buffer that was changed. */ |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
159 current_buffer = XBUFFER (buffer); |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
160 |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
161 if (boundary) |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
162 Fundo_boundary (); |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
163 |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
164 if (MODIFF <= current_buffer->save_modified) |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
165 record_first_change (); |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
166 |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
167 XSET (lbeg, Lisp_Int, beg); |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
168 XSET (lend, Lisp_Int, beg + length); |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
169 entry = Fcons (Qnil, Fcons (prop, Fcons (value, Fcons (lbeg, lend)))); |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
170 current_buffer->undo_list = Fcons (entry, current_buffer->undo_list); |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
171 |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
172 current_buffer = obuf; |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
173 } |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
174 |
| 223 | 175 DEFUN ("undo-boundary", Fundo_boundary, Sundo_boundary, 0, 0, 0, |
| 176 "Mark a boundary between units of undo.\n\ | |
| 177 An undo command will stop at this point,\n\ | |
| 178 but another undo command will undo to the previous boundary.") | |
| 179 () | |
| 180 { | |
| 181 Lisp_Object tem; | |
| 182 if (EQ (current_buffer->undo_list, Qt)) | |
| 183 return Qnil; | |
| 184 tem = Fcar (current_buffer->undo_list); | |
| 485 | 185 if (!NILP (tem)) |
| 223 | 186 current_buffer->undo_list = Fcons (Qnil, current_buffer->undo_list); |
| 187 return Qnil; | |
| 188 } | |
| 189 | |
| 190 /* At garbage collection time, make an undo list shorter at the end, | |
| 191 returning the truncated list. | |
| 192 MINSIZE and MAXSIZE are the limits on size allowed, as described below. | |
| 761 | 193 In practice, these are the values of undo-limit and |
| 194 undo-strong-limit. */ | |
| 223 | 195 |
| 196 Lisp_Object | |
| 197 truncate_undo_list (list, minsize, maxsize) | |
| 198 Lisp_Object list; | |
| 199 int minsize, maxsize; | |
| 200 { | |
| 201 Lisp_Object prev, next, last_boundary; | |
| 202 int size_so_far = 0; | |
| 203 | |
| 204 prev = Qnil; | |
| 205 next = list; | |
| 206 last_boundary = Qnil; | |
| 207 | |
| 208 /* Always preserve at least the most recent undo record. | |
| 241 | 209 If the first element is an undo boundary, skip past it. |
| 210 | |
| 211 Skip, skip, skip the undo, skip, skip, skip the undo, | |
| 970 | 212 Skip, skip, skip the undo, skip to the undo bound'ry. |
| 213 (Get it? "Skip to my Loo?") */ | |
| 223 | 214 if (XTYPE (next) == Lisp_Cons |
|
1524
91454bf15944
* undo.c (record_insert): Use accessors on BEG and LENGTH.
Jim Blandy <jimb@redhat.com>
parents:
1320
diff
changeset
|
215 && NILP (XCONS (next)->car)) |
| 223 | 216 { |
| 217 /* Add in the space occupied by this element and its chain link. */ | |
| 218 size_so_far += sizeof (struct Lisp_Cons); | |
| 219 | |
| 220 /* Advance to next element. */ | |
| 221 prev = next; | |
| 222 next = XCONS (next)->cdr; | |
| 223 } | |
| 224 while (XTYPE (next) == Lisp_Cons | |
|
1524
91454bf15944
* undo.c (record_insert): Use accessors on BEG and LENGTH.
Jim Blandy <jimb@redhat.com>
parents:
1320
diff
changeset
|
225 && ! NILP (XCONS (next)->car)) |
| 223 | 226 { |
| 227 Lisp_Object elt; | |
| 228 elt = XCONS (next)->car; | |
| 229 | |
| 230 /* Add in the space occupied by this element and its chain link. */ | |
| 231 size_so_far += sizeof (struct Lisp_Cons); | |
| 232 if (XTYPE (elt) == Lisp_Cons) | |
| 233 { | |
| 234 size_so_far += sizeof (struct Lisp_Cons); | |
| 235 if (XTYPE (XCONS (elt)->car) == Lisp_String) | |
| 236 size_so_far += (sizeof (struct Lisp_String) - 1 | |
| 237 + XSTRING (XCONS (elt)->car)->size); | |
| 238 } | |
| 239 | |
| 240 /* Advance to next element. */ | |
| 241 prev = next; | |
| 242 next = XCONS (next)->cdr; | |
| 243 } | |
| 244 if (XTYPE (next) == Lisp_Cons) | |
| 245 last_boundary = prev; | |
| 246 | |
| 247 while (XTYPE (next) == Lisp_Cons) | |
| 248 { | |
| 249 Lisp_Object elt; | |
| 250 elt = XCONS (next)->car; | |
| 251 | |
| 252 /* When we get to a boundary, decide whether to truncate | |
| 253 either before or after it. The lower threshold, MINSIZE, | |
| 254 tells us to truncate after it. If its size pushes past | |
| 255 the higher threshold MAXSIZE as well, we truncate before it. */ | |
| 485 | 256 if (NILP (elt)) |
| 223 | 257 { |
| 258 if (size_so_far > maxsize) | |
| 259 break; | |
| 260 last_boundary = prev; | |
| 261 if (size_so_far > minsize) | |
| 262 break; | |
| 263 } | |
| 264 | |
| 265 /* Add in the space occupied by this element and its chain link. */ | |
| 266 size_so_far += sizeof (struct Lisp_Cons); | |
| 267 if (XTYPE (elt) == Lisp_Cons) | |
| 268 { | |
| 269 size_so_far += sizeof (struct Lisp_Cons); | |
| 270 if (XTYPE (XCONS (elt)->car) == Lisp_String) | |
| 271 size_so_far += (sizeof (struct Lisp_String) - 1 | |
| 272 + XSTRING (XCONS (elt)->car)->size); | |
| 273 } | |
| 274 | |
| 275 /* Advance to next element. */ | |
| 276 prev = next; | |
| 277 next = XCONS (next)->cdr; | |
| 278 } | |
| 279 | |
| 280 /* If we scanned the whole list, it is short enough; don't change it. */ | |
| 485 | 281 if (NILP (next)) |
| 223 | 282 return list; |
| 283 | |
| 284 /* Truncate at the boundary where we decided to truncate. */ | |
| 485 | 285 if (!NILP (last_boundary)) |
| 223 | 286 { |
| 287 XCONS (last_boundary)->cdr = Qnil; | |
| 288 return list; | |
| 289 } | |
| 290 else | |
| 291 return Qnil; | |
| 292 } | |
| 293 | |
| 294 DEFUN ("primitive-undo", Fprimitive_undo, Sprimitive_undo, 2, 2, 0, | |
| 295 "Undo N records from the front of the list LIST.\n\ | |
| 296 Return what remains of the list.") | |
|
3719
695181e4bc20
(Fprimitive_undo): Rename arg to N to avoid conflict.
Richard M. Stallman <rms@gnu.org>
parents:
3696
diff
changeset
|
297 (n, list) |
|
695181e4bc20
(Fprimitive_undo): Rename arg to N to avoid conflict.
Richard M. Stallman <rms@gnu.org>
parents:
3696
diff
changeset
|
298 Lisp_Object n, list; |
| 223 | 299 { |
|
3696
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
300 int count = specpdl_ptr - specpdl; |
|
3719
695181e4bc20
(Fprimitive_undo): Rename arg to N to avoid conflict.
Richard M. Stallman <rms@gnu.org>
parents:
3696
diff
changeset
|
301 register int arg = XINT (n); |
| 223 | 302 #if 0 /* This is a good feature, but would make undo-start |
| 303 unable to do what is expected. */ | |
| 304 Lisp_Object tem; | |
| 305 | |
| 306 /* If the head of the list is a boundary, it is the boundary | |
| 307 preceding this command. Get rid of it and don't count it. */ | |
| 308 tem = Fcar (list); | |
| 485 | 309 if (NILP (tem)) |
| 223 | 310 list = Fcdr (list); |
| 311 #endif | |
| 312 | |
|
3696
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
313 /* Don't let read-only properties interfere with undo. */ |
|
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
314 if (NILP (current_buffer->read_only)) |
|
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
315 specbind (Qinhibit_read_only, Qt); |
|
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
316 |
| 223 | 317 while (arg > 0) |
| 318 { | |
| 319 while (1) | |
| 320 { | |
|
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
321 Lisp_Object next; |
| 223 | 322 next = Fcar (list); |
| 323 list = Fcdr (list); | |
|
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
324 /* Exit inner loop at undo boundary. */ |
| 485 | 325 if (NILP (next)) |
| 223 | 326 break; |
|
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
327 /* Handle an integer by setting point to that value. */ |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
328 if (XTYPE (next) == Lisp_Int) |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
329 SET_PT (clip_to_bounds (BEGV, XINT (next), ZV)); |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
330 else if (XTYPE (next) == Lisp_Cons) |
| 223 | 331 { |
|
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
332 Lisp_Object car, cdr; |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
333 |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
334 car = Fcar (next); |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
335 cdr = Fcdr (next); |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
336 if (EQ (car, Qt)) |
| 223 | 337 { |
|
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
338 /* Element (t high . low) records previous modtime. */ |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
339 Lisp_Object high, low; |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
340 int mod_time; |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
341 |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
342 high = Fcar (cdr); |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
343 low = Fcdr (cdr); |
|
3687
54381151027d
(record_delete): Always use XFASTINT on sbeg.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
344 mod_time = (XFASTINT (high) << 16) + XFASTINT (low); |
|
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
345 /* If this records an obsolete save |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
346 (not matching the actual disk file) |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
347 then don't mark unmodified. */ |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
348 if (mod_time != current_buffer->modtime) |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
349 break; |
|
1598
3e9dadf2d13c
* undo.c (Fprimitive_undo): Remove whitespace in front of #ifdef
Jim Blandy <jimb@redhat.com>
parents:
1524
diff
changeset
|
350 #ifdef CLASH_DETECTION |
|
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
351 Funlock_buffer (); |
|
1598
3e9dadf2d13c
* undo.c (Fprimitive_undo): Remove whitespace in front of #ifdef
Jim Blandy <jimb@redhat.com>
parents:
1524
diff
changeset
|
352 #endif /* CLASH_DETECTION */ |
|
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
353 Fset_buffer_modified_p (Qnil); |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
354 } |
|
3687
54381151027d
(record_delete): Always use XFASTINT on sbeg.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
355 #ifdef USE_TEXT_PROPERTIES |
|
54381151027d
(record_delete): Always use XFASTINT on sbeg.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
356 else if (EQ (car, Qnil)) |
|
1968
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
357 { |
|
3687
54381151027d
(record_delete): Always use XFASTINT on sbeg.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
358 /* Element (nil prop val beg . end) is property change. */ |
|
1968
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
359 Lisp_Object beg, end, prop, val; |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
360 |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
361 prop = Fcar (cdr); |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
362 cdr = Fcdr (cdr); |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
363 val = Fcar (cdr); |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
364 cdr = Fcdr (cdr); |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
365 beg = Fcar (cdr); |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
366 end = Fcdr (cdr); |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
367 |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
368 Fput_text_property (beg, end, prop, val, Qnil); |
|
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
369 } |
|
3687
54381151027d
(record_delete): Always use XFASTINT on sbeg.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
370 #endif /* USE_TEXT_PROPERTIES */ |
|
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
371 else if (XTYPE (car) == Lisp_Int && XTYPE (cdr) == Lisp_Int) |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
372 { |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
373 /* Element (BEG . END) means range was inserted. */ |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
374 Lisp_Object end; |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
375 |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
376 if (XINT (car) < BEGV |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
377 || XINT (cdr) > ZV) |
| 223 | 378 error ("Changes to be undone are outside visible portion of buffer"); |
|
1320
c45c4e0cae7d
(Fprimitive_undo): When undoing an insert, move point and then delete.
Richard M. Stallman <rms@gnu.org>
parents:
1248
diff
changeset
|
379 /* Set point first thing, so that undoing this undo |
|
c45c4e0cae7d
(Fprimitive_undo): When undoing an insert, move point and then delete.
Richard M. Stallman <rms@gnu.org>
parents:
1248
diff
changeset
|
380 does not send point back to where it is now. */ |
|
c45c4e0cae7d
(Fprimitive_undo): When undoing an insert, move point and then delete.
Richard M. Stallman <rms@gnu.org>
parents:
1248
diff
changeset
|
381 Fgoto_char (car); |
|
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
382 Fdelete_region (car, cdr); |
| 223 | 383 } |
|
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
384 else if (XTYPE (car) == Lisp_String && XTYPE (cdr) == Lisp_Int) |
| 223 | 385 { |
|
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
386 /* Element (STRING . POS) means STRING was deleted. */ |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
387 Lisp_Object membuf; |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
388 int pos = XINT (cdr); |
| 544 | 389 |
|
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
390 membuf = car; |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
391 if (pos < 0) |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
392 { |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
393 if (-pos < BEGV || -pos > ZV) |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
394 error ("Changes to be undone are outside visible portion of buffer"); |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
395 SET_PT (-pos); |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
396 Finsert (1, &membuf); |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
397 } |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
398 else |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
399 { |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
400 if (pos < BEGV || pos > ZV) |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
401 error ("Changes to be undone are outside visible portion of buffer"); |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
402 SET_PT (pos); |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
403 |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
404 /* Insert before markers so that if the mark is |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
405 currently on the boundary of this deletion, it |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
406 ends up on the other side of the now-undeleted |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
407 text from point. Since undo doesn't even keep |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
408 track of the mark, this isn't really necessary, |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
409 but it may lead to better behavior in certain |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
410 situations. */ |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
411 Finsert_before_markers (1, &membuf); |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
412 SET_PT (pos); |
|
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
413 } |
| 223 | 414 } |
| 415 } | |
| 416 } | |
| 417 arg--; | |
| 418 } | |
| 419 | |
|
3696
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
420 return unbind_to (count, list); |
| 223 | 421 } |
| 422 | |
| 423 syms_of_undo () | |
| 424 { | |
|
3696
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
425 Qinhibit_read_only = intern ("inhibit-read-only"); |
|
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
426 staticpro (&Qinhibit_read_only); |
|
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
427 |
| 223 | 428 defsubr (&Sprimitive_undo); |
| 429 defsubr (&Sundo_boundary); | |
| 430 } |
