Mercurial > emacs
annotate src/undo.c @ 58627:fee84e9454db
*** empty log message ***
author | Jay Belanger <jay.p.belanger@gmail.com> |
---|---|
date | Mon, 29 Nov 2004 22:50:05 +0000 |
parents | 9e7829a684df |
children | 2daab60919ed 4c90ffeb71c5 |
rev | line source |
---|---|
223 | 1 /* undo handling for GNU Emacs. |
34169 | 2 Copyright (C) 1990, 1993, 1994, 2000 Free Software Foundation, Inc. |
223 | 3 |
4 This file is part of GNU Emacs. | |
5 | |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12649
diff
changeset
|
6 GNU Emacs is free software; you can redistribute it and/or modify |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12649
diff
changeset
|
7 it under the terms of the GNU General Public License as published by |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12649
diff
changeset
|
8 the Free Software Foundation; either version 2, or (at your option) |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12649
diff
changeset
|
9 any later version. |
223 | 10 |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12649
diff
changeset
|
11 GNU Emacs is distributed in the hope that it will be useful, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12649
diff
changeset
|
12 but WITHOUT ANY WARRANTY; without even the implied warranty of |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12649
diff
changeset
|
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12649
diff
changeset
|
14 GNU General Public License for more details. |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12649
diff
changeset
|
15 |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12649
diff
changeset
|
16 You should have received a copy of the GNU General Public License |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12649
diff
changeset
|
17 along with GNU Emacs; see the file COPYING. If not, write to |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12649
diff
changeset
|
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12649
diff
changeset
|
19 Boston, MA 02111-1307, USA. */ |
223 | 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 |
6254
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
32 /* The first time a command records something for undo. |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
33 it also allocates the undo-boundary object |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
34 which will be added to the list at the end of the command. |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
35 This ensures we can't run out of space while trying to make |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
36 an undo-boundary. */ |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
37 Lisp_Object pending_boundary; |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
38 |
44391
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
39 /* Record point as it was at beginning of this command (if necessary) |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
40 And prepare the undo info for recording a change. |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
41 PT is the position of point that will naturally occur as a result of the |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
42 undo record that will be added just after this command terminates. */ |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
43 |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
44 static void |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
45 record_point (pt) |
48326 | 46 int pt; |
44391
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
47 { |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
48 int at_boundary; |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
49 |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
50 /* Allocate a cons cell to be the undo boundary after this command. */ |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
51 if (NILP (pending_boundary)) |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
52 pending_boundary = Fcons (Qnil, Qnil); |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
53 |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
54 if (!BUFFERP (last_undo_buffer) |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
55 || current_buffer != XBUFFER (last_undo_buffer)) |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
56 Fundo_boundary (); |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
57 XSETBUFFER (last_undo_buffer, current_buffer); |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
58 |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
59 if (CONSP (current_buffer->undo_list)) |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
60 { |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
61 /* Set AT_BOUNDARY to 1 only when we have nothing other than |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
62 marker adjustment before undo boundary. */ |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
63 |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
64 Lisp_Object tail = current_buffer->undo_list, elt; |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
65 |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
66 while (1) |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
67 { |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
68 if (NILP (tail)) |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
69 elt = Qnil; |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
70 else |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
71 elt = XCAR (tail); |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
72 if (NILP (elt) || ! (CONSP (elt) && MARKERP (XCAR (elt)))) |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
73 break; |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
74 tail = XCDR (tail); |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
75 } |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
76 at_boundary = NILP (elt); |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
77 } |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
78 else |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
79 at_boundary = 1; |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
80 |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
81 if (MODIFF <= SAVE_MODIFF) |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
82 record_first_change (); |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
83 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48326
diff
changeset
|
84 /* If we are just after an undo boundary, and |
44391
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
85 point wasn't at start of deleted range, record where it was. */ |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
86 if (at_boundary |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
87 && last_point_position != pt |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
88 /* If we're called from batch mode, this could be nil. */ |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
89 && BUFFERP (last_point_position_buffer) |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
90 && current_buffer == XBUFFER (last_point_position_buffer)) |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
91 current_buffer->undo_list |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
92 = Fcons (make_number (last_point_position), current_buffer->undo_list); |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
93 } |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
94 |
223 | 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 | |
20372
259194f66d40
(record_change, record_first_change,
Kenichi Handa <handa@m17n.org>
parents:
17447
diff
changeset
|
100 void |
223 | 101 record_insert (beg, length) |
12088
f0c9d02fb6e4
(record_insert): Change args to be ints, not Lisp_Objects.
Karl Heuer <kwzh@gnu.org>
parents:
10300
diff
changeset
|
102 int beg, length; |
223 | 103 { |
104 Lisp_Object lbeg, lend; | |
105 | |
2194
886a69457557
(record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents:
1968
diff
changeset
|
106 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
|
107 return; |
886a69457557
(record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents:
1968
diff
changeset
|
108 |
44391
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
109 record_point (beg); |
223 | 110 |
111 /* If this is following another insertion and consecutive with it | |
112 in the buffer, combine the two. */ | |
9108
c0287cefc0f8
(record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
7671
diff
changeset
|
113 if (CONSP (current_buffer->undo_list)) |
223 | 114 { |
115 Lisp_Object elt; | |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
116 elt = XCAR (current_buffer->undo_list); |
9108
c0287cefc0f8
(record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
7671
diff
changeset
|
117 if (CONSP (elt) |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
118 && INTEGERP (XCAR (elt)) |
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
119 && INTEGERP (XCDR (elt)) |
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
120 && XINT (XCDR (elt)) == beg) |
223 | 121 { |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39798
diff
changeset
|
122 XSETCDR (elt, make_number (beg + length)); |
223 | 123 return; |
124 } | |
125 } | |
126 | |
12088
f0c9d02fb6e4
(record_insert): Change args to be ints, not Lisp_Objects.
Karl Heuer <kwzh@gnu.org>
parents:
10300
diff
changeset
|
127 XSETFASTINT (lbeg, beg); |
f0c9d02fb6e4
(record_insert): Change args to be ints, not Lisp_Objects.
Karl Heuer <kwzh@gnu.org>
parents:
10300
diff
changeset
|
128 XSETINT (lend, beg + length); |
1524
91454bf15944
* undo.c (record_insert): Use accessors on BEG and LENGTH.
Jim Blandy <jimb@redhat.com>
parents:
1320
diff
changeset
|
129 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
|
130 current_buffer->undo_list); |
223 | 131 } |
132 | |
133 /* Record that a deletion is about to take place, | |
21237
c5a8ee5b9b39
(record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents:
20373
diff
changeset
|
134 of the characters in STRING, at location BEG. */ |
223 | 135 |
20373
b6c215dec8c8
(record_delete, record_marker_adjustment): Declare them as void.
Kenichi Handa <handa@m17n.org>
parents:
20372
diff
changeset
|
136 void |
21237
c5a8ee5b9b39
(record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents:
20373
diff
changeset
|
137 record_delete (beg, string) |
c5a8ee5b9b39
(record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents:
20373
diff
changeset
|
138 int beg; |
c5a8ee5b9b39
(record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents:
20373
diff
changeset
|
139 Lisp_Object string; |
223 | 140 { |
21237
c5a8ee5b9b39
(record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents:
20373
diff
changeset
|
141 Lisp_Object sbeg; |
223 | 142 |
2194
886a69457557
(record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents:
1968
diff
changeset
|
143 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
|
144 return; |
886a69457557
(record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents:
1968
diff
changeset
|
145 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46285
diff
changeset
|
146 if (PT == beg + SCHARS (string)) |
21272
b1bc69132f55
(record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents:
21237
diff
changeset
|
147 { |
44391
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
148 XSETINT (sbeg, -beg); |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
149 record_point (PT); |
21272
b1bc69132f55
(record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents:
21237
diff
changeset
|
150 } |
b1bc69132f55
(record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents:
21237
diff
changeset
|
151 else |
44391
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
152 { |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
153 XSETFASTINT (sbeg, beg); |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
154 record_point (beg); |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
155 } |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
156 |
223 | 157 current_buffer->undo_list |
21237
c5a8ee5b9b39
(record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents:
20373
diff
changeset
|
158 = Fcons (Fcons (string, sbeg), current_buffer->undo_list); |
223 | 159 } |
160 | |
14480
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
161 /* Record the fact that MARKER is about to be adjusted by ADJUSTMENT. |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
162 This is done only when a marker points within text being deleted, |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
163 because that's the only case where an automatic marker adjustment |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
164 won't be inverted automatically by undoing the buffer modification. */ |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
165 |
20373
b6c215dec8c8
(record_delete, record_marker_adjustment): Declare them as void.
Kenichi Handa <handa@m17n.org>
parents:
20372
diff
changeset
|
166 void |
14480
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
167 record_marker_adjustment (marker, adjustment) |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
168 Lisp_Object marker; |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
169 int adjustment; |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
170 { |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
171 if (EQ (current_buffer->undo_list, Qt)) |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
172 return; |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
173 |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
174 /* Allocate a cons cell to be the undo boundary after this command. */ |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
175 if (NILP (pending_boundary)) |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
176 pending_boundary = Fcons (Qnil, Qnil); |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
177 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48326
diff
changeset
|
178 if (!BUFFERP (last_undo_buffer) |
30961
78ce106d272e
(record_first_change, record_marker_adjustment): Don'use
Gerd Moellmann <gerd@gnu.org>
parents:
30682
diff
changeset
|
179 || current_buffer != XBUFFER (last_undo_buffer)) |
14480
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
180 Fundo_boundary (); |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
181 XSETBUFFER (last_undo_buffer, current_buffer); |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
182 |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
183 current_buffer->undo_list |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
184 = Fcons (Fcons (marker, make_number (adjustment)), |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
185 current_buffer->undo_list); |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
186 } |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
187 |
223 | 188 /* Record that a replacement is about to take place, |
189 for LENGTH characters at location BEG. | |
21237
c5a8ee5b9b39
(record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents:
20373
diff
changeset
|
190 The replacement must not change the number of characters. */ |
223 | 191 |
20373
b6c215dec8c8
(record_delete, record_marker_adjustment): Declare them as void.
Kenichi Handa <handa@m17n.org>
parents:
20372
diff
changeset
|
192 void |
223 | 193 record_change (beg, length) |
194 int beg, length; | |
195 { | |
21237
c5a8ee5b9b39
(record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents:
20373
diff
changeset
|
196 record_delete (beg, make_buffer_string (beg, beg + length, 1)); |
223 | 197 record_insert (beg, length); |
198 } | |
199 | |
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 | |
20372
259194f66d40
(record_change, record_first_change,
Kenichi Handa <handa@m17n.org>
parents:
17447
diff
changeset
|
204 void |
223 | 205 record_first_change () |
206 { | |
207 Lisp_Object high, low; | |
10300
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
208 struct buffer *base_buffer = current_buffer; |
5762
099857a46901
(record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
209 |
099857a46901
(record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
210 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
|
211 return; |
099857a46901
(record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
212 |
30961
78ce106d272e
(record_first_change, record_marker_adjustment): Don'use
Gerd Moellmann <gerd@gnu.org>
parents:
30682
diff
changeset
|
213 if (!BUFFERP (last_undo_buffer) |
78ce106d272e
(record_first_change, record_marker_adjustment): Don'use
Gerd Moellmann <gerd@gnu.org>
parents:
30682
diff
changeset
|
214 || current_buffer != XBUFFER (last_undo_buffer)) |
5762
099857a46901
(record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
215 Fundo_boundary (); |
9281
05b2bd5d5559
(record_insert, record_delete, record_first_change, record_property_change):
Karl Heuer <kwzh@gnu.org>
parents:
9108
diff
changeset
|
216 XSETBUFFER (last_undo_buffer, current_buffer); |
5762
099857a46901
(record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
217 |
10300
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
218 if (base_buffer->base_buffer) |
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
219 base_buffer = base_buffer->base_buffer; |
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
220 |
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
221 XSETFASTINT (high, (base_buffer->modtime >> 16) & 0xffff); |
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
222 XSETFASTINT (low, base_buffer->modtime & 0xffff); |
223 | 223 current_buffer->undo_list = Fcons (Fcons (Qt, Fcons (high, low)), current_buffer->undo_list); |
224 } | |
225 | |
1968
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
226 /* 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
|
227 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
|
228 |
20372
259194f66d40
(record_change, record_first_change,
Kenichi Handa <handa@m17n.org>
parents:
17447
diff
changeset
|
229 void |
1968
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
230 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
|
231 int beg, length; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
232 Lisp_Object prop, value, buffer; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
233 { |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
234 Lisp_Object lbeg, lend, entry; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
235 struct buffer *obuf = current_buffer; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
236 int boundary = 0; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
237 |
5762
099857a46901
(record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
238 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
|
239 return; |
886a69457557
(record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents:
1968
diff
changeset
|
240 |
6254
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
241 /* Allocate a cons cell to be the undo boundary after this command. */ |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
242 if (NILP (pending_boundary)) |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
243 pending_boundary = Fcons (Qnil, Qnil); |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
244 |
1968
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
245 if (!EQ (buffer, last_undo_buffer)) |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
246 boundary = 1; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
247 last_undo_buffer = buffer; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
248 |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
249 /* 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
|
250 current_buffer = XBUFFER (buffer); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
251 |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
252 if (boundary) |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
253 Fundo_boundary (); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
254 |
10300
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
255 if (MODIFF <= SAVE_MODIFF) |
1968
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
256 record_first_change (); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
257 |
9281
05b2bd5d5559
(record_insert, record_delete, record_first_change, record_property_change):
Karl Heuer <kwzh@gnu.org>
parents:
9108
diff
changeset
|
258 XSETINT (lbeg, beg); |
05b2bd5d5559
(record_insert, record_delete, record_first_change, record_property_change):
Karl Heuer <kwzh@gnu.org>
parents:
9108
diff
changeset
|
259 XSETINT (lend, beg + length); |
1968
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
260 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
|
261 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
|
262 |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
263 current_buffer = obuf; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
264 } |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
265 |
223 | 266 DEFUN ("undo-boundary", Fundo_boundary, Sundo_boundary, 0, 0, 0, |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
267 doc: /* Mark a boundary between units of undo. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
268 An undo command will stop at this point, |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
269 but another undo command will undo to the previous boundary. */) |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
270 () |
223 | 271 { |
272 Lisp_Object tem; | |
273 if (EQ (current_buffer->undo_list, Qt)) | |
274 return Qnil; | |
275 tem = Fcar (current_buffer->undo_list); | |
485 | 276 if (!NILP (tem)) |
6254
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
277 { |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
278 /* One way or another, cons nil onto the front of the undo list. */ |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
279 if (!NILP (pending_boundary)) |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
280 { |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
281 /* If we have preallocated the cons cell to use here, |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
282 use that one. */ |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39798
diff
changeset
|
283 XSETCDR (pending_boundary, current_buffer->undo_list); |
6254
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
284 current_buffer->undo_list = pending_boundary; |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
285 pending_boundary = Qnil; |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
286 } |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
287 else |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
288 current_buffer->undo_list = Fcons (Qnil, current_buffer->undo_list); |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
289 } |
223 | 290 return Qnil; |
291 } | |
292 | |
293 /* At garbage collection time, make an undo list shorter at the end, | |
294 returning the truncated list. | |
55839
9e7829a684df
(truncate_undo_list): New arg LIMITSIZE.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
295 MINSIZE, MAXSIZE and LIMITSIZE are the limits on size allowed, |
9e7829a684df
(truncate_undo_list): New arg LIMITSIZE.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
296 as described below. |
9e7829a684df
(truncate_undo_list): New arg LIMITSIZE.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
297 In practice, these are the values of undo-limit, |
9e7829a684df
(truncate_undo_list): New arg LIMITSIZE.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
298 undo-strong-limit, and undo-outer-limit. */ |
223 | 299 |
300 Lisp_Object | |
55839
9e7829a684df
(truncate_undo_list): New arg LIMITSIZE.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
301 truncate_undo_list (list, minsize, maxsize, limitsize) |
223 | 302 Lisp_Object list; |
55839
9e7829a684df
(truncate_undo_list): New arg LIMITSIZE.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
303 int minsize, maxsize, limitsize; |
223 | 304 { |
305 Lisp_Object prev, next, last_boundary; | |
306 int size_so_far = 0; | |
307 | |
308 prev = Qnil; | |
309 next = list; | |
310 last_boundary = Qnil; | |
311 | |
55839
9e7829a684df
(truncate_undo_list): New arg LIMITSIZE.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
312 /* Always preserve at least the most recent undo record |
9e7829a684df
(truncate_undo_list): New arg LIMITSIZE.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
313 unless it is really horribly big. |
241 | 314 If the first element is an undo boundary, skip past it. |
315 | |
316 Skip, skip, skip the undo, skip, skip, skip the undo, | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48326
diff
changeset
|
317 Skip, skip, skip the undo, skip to the undo bound'ry. |
970 | 318 (Get it? "Skip to my Loo?") */ |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
319 if (CONSP (next) && NILP (XCAR (next))) |
223 | 320 { |
321 /* Add in the space occupied by this element and its chain link. */ | |
322 size_so_far += sizeof (struct Lisp_Cons); | |
323 | |
324 /* Advance to next element. */ | |
325 prev = next; | |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
326 next = XCDR (next); |
223 | 327 } |
55839
9e7829a684df
(truncate_undo_list): New arg LIMITSIZE.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
328 |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
329 while (CONSP (next) && ! NILP (XCAR (next))) |
223 | 330 { |
331 Lisp_Object elt; | |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
332 elt = XCAR (next); |
223 | 333 |
334 /* Add in the space occupied by this element and its chain link. */ | |
335 size_so_far += sizeof (struct Lisp_Cons); | |
9108
c0287cefc0f8
(record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
7671
diff
changeset
|
336 if (CONSP (elt)) |
223 | 337 { |
338 size_so_far += sizeof (struct Lisp_Cons); | |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
339 if (STRINGP (XCAR (elt))) |
223 | 340 size_so_far += (sizeof (struct Lisp_String) - 1 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46285
diff
changeset
|
341 + SCHARS (XCAR (elt))); |
223 | 342 } |
343 | |
55839
9e7829a684df
(truncate_undo_list): New arg LIMITSIZE.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
344 /* If we reach LIMITSIZE before the first boundary, |
9e7829a684df
(truncate_undo_list): New arg LIMITSIZE.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
345 we're heading for memory full, so truncate the list to nothing. */ |
9e7829a684df
(truncate_undo_list): New arg LIMITSIZE.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
346 if (size_so_far > limitsize) |
9e7829a684df
(truncate_undo_list): New arg LIMITSIZE.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
347 return Qnil; |
9e7829a684df
(truncate_undo_list): New arg LIMITSIZE.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
348 |
223 | 349 /* Advance to next element. */ |
350 prev = next; | |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
351 next = XCDR (next); |
223 | 352 } |
55839
9e7829a684df
(truncate_undo_list): New arg LIMITSIZE.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
353 |
9108
c0287cefc0f8
(record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
7671
diff
changeset
|
354 if (CONSP (next)) |
223 | 355 last_boundary = prev; |
356 | |
55839
9e7829a684df
(truncate_undo_list): New arg LIMITSIZE.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
357 /* Keep more if it fits. */ |
9108
c0287cefc0f8
(record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
7671
diff
changeset
|
358 while (CONSP (next)) |
223 | 359 { |
360 Lisp_Object elt; | |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
361 elt = XCAR (next); |
223 | 362 |
363 /* When we get to a boundary, decide whether to truncate | |
364 either before or after it. The lower threshold, MINSIZE, | |
365 tells us to truncate after it. If its size pushes past | |
366 the higher threshold MAXSIZE as well, we truncate before it. */ | |
485 | 367 if (NILP (elt)) |
223 | 368 { |
369 if (size_so_far > maxsize) | |
370 break; | |
371 last_boundary = prev; | |
372 if (size_so_far > minsize) | |
373 break; | |
374 } | |
375 | |
376 /* Add in the space occupied by this element and its chain link. */ | |
377 size_so_far += sizeof (struct Lisp_Cons); | |
9108
c0287cefc0f8
(record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
7671
diff
changeset
|
378 if (CONSP (elt)) |
223 | 379 { |
380 size_so_far += sizeof (struct Lisp_Cons); | |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
381 if (STRINGP (XCAR (elt))) |
223 | 382 size_so_far += (sizeof (struct Lisp_String) - 1 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46285
diff
changeset
|
383 + SCHARS (XCAR (elt))); |
223 | 384 } |
385 | |
386 /* Advance to next element. */ | |
387 prev = next; | |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
388 next = XCDR (next); |
223 | 389 } |
390 | |
391 /* If we scanned the whole list, it is short enough; don't change it. */ | |
485 | 392 if (NILP (next)) |
223 | 393 return list; |
394 | |
395 /* Truncate at the boundary where we decided to truncate. */ | |
485 | 396 if (!NILP (last_boundary)) |
223 | 397 { |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39798
diff
changeset
|
398 XSETCDR (last_boundary, Qnil); |
223 | 399 return list; |
400 } | |
401 else | |
402 return Qnil; | |
403 } | |
404 | |
405 DEFUN ("primitive-undo", Fprimitive_undo, Sprimitive_undo, 2, 2, 0, | |
40123
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
406 doc: /* Undo N records from the front of the list LIST. |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
407 Return what remains of the list. */) |
e528f2adeed4
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
408 (n, list) |
3719
695181e4bc20
(Fprimitive_undo): Rename arg to N to avoid conflict.
Richard M. Stallman <rms@gnu.org>
parents:
3696
diff
changeset
|
409 Lisp_Object n, list; |
223 | 410 { |
7671
31d444fcae24
(Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents:
7395
diff
changeset
|
411 struct gcpro gcpro1, gcpro2; |
31d444fcae24
(Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents:
7395
diff
changeset
|
412 Lisp_Object next; |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
44391
diff
changeset
|
413 int count = SPECPDL_INDEX (); |
7671
31d444fcae24
(Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents:
7395
diff
changeset
|
414 register int arg; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48326
diff
changeset
|
415 |
223 | 416 #if 0 /* This is a good feature, but would make undo-start |
417 unable to do what is expected. */ | |
418 Lisp_Object tem; | |
419 | |
420 /* If the head of the list is a boundary, it is the boundary | |
421 preceding this command. Get rid of it and don't count it. */ | |
422 tem = Fcar (list); | |
485 | 423 if (NILP (tem)) |
223 | 424 list = Fcdr (list); |
425 #endif | |
426 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40123
diff
changeset
|
427 CHECK_NUMBER (n); |
7671
31d444fcae24
(Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents:
7395
diff
changeset
|
428 arg = XINT (n); |
31d444fcae24
(Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents:
7395
diff
changeset
|
429 next = Qnil; |
31d444fcae24
(Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents:
7395
diff
changeset
|
430 GCPRO2 (next, list); |
31d444fcae24
(Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents:
7395
diff
changeset
|
431 |
37527
d585b711c8d2
(Fprimitive_undo): In a writable buffer, enable undoing
Gerd Moellmann <gerd@gnu.org>
parents:
34965
diff
changeset
|
432 /* In a writable buffer, enable undoing read-only text that is so |
d585b711c8d2
(Fprimitive_undo): In a writable buffer, enable undoing
Gerd Moellmann <gerd@gnu.org>
parents:
34965
diff
changeset
|
433 because of text properties. */ |
d585b711c8d2
(Fprimitive_undo): In a writable buffer, enable undoing
Gerd Moellmann <gerd@gnu.org>
parents:
34965
diff
changeset
|
434 if (NILP (current_buffer->read_only)) |
3696
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
435 specbind (Qinhibit_read_only, Qt); |
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
436 |
34794
12ca043196d7
(Fprimitive_undo): Bind `inhibit-point-motion-hooks' to t.
Gerd Moellmann <gerd@gnu.org>
parents:
34169
diff
changeset
|
437 /* Don't let `intangible' properties interfere with undo. */ |
12ca043196d7
(Fprimitive_undo): Bind `inhibit-point-motion-hooks' to t.
Gerd Moellmann <gerd@gnu.org>
parents:
34169
diff
changeset
|
438 specbind (Qinhibit_point_motion_hooks, Qt); |
12ca043196d7
(Fprimitive_undo): Bind `inhibit-point-motion-hooks' to t.
Gerd Moellmann <gerd@gnu.org>
parents:
34169
diff
changeset
|
439 |
223 | 440 while (arg > 0) |
441 { | |
39798
d54a90934144
(Fprimitive_undo): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37527
diff
changeset
|
442 while (CONSP (list)) |
223 | 443 { |
39798
d54a90934144
(Fprimitive_undo): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37527
diff
changeset
|
444 next = XCAR (list); |
d54a90934144
(Fprimitive_undo): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37527
diff
changeset
|
445 list = XCDR (list); |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
446 /* Exit inner loop at undo boundary. */ |
485 | 447 if (NILP (next)) |
223 | 448 break; |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
449 /* Handle an integer by setting point to that value. */ |
9108
c0287cefc0f8
(record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
7671
diff
changeset
|
450 if (INTEGERP (next)) |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
451 SET_PT (clip_to_bounds (BEGV, XINT (next), ZV)); |
9108
c0287cefc0f8
(record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
7671
diff
changeset
|
452 else if (CONSP (next)) |
223 | 453 { |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
454 Lisp_Object car, cdr; |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
455 |
39798
d54a90934144
(Fprimitive_undo): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37527
diff
changeset
|
456 car = XCAR (next); |
d54a90934144
(Fprimitive_undo): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37527
diff
changeset
|
457 cdr = XCDR (next); |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
458 if (EQ (car, Qt)) |
223 | 459 { |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
460 /* 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
|
461 Lisp_Object high, low; |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
462 int mod_time; |
10300
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
463 struct buffer *base_buffer = current_buffer; |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
464 |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
465 high = Fcar (cdr); |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
466 low = Fcdr (cdr); |
3687
54381151027d
(record_delete): Always use XFASTINT on sbeg.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
467 mod_time = (XFASTINT (high) << 16) + XFASTINT (low); |
10300
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
468 |
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
469 if (current_buffer->base_buffer) |
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
470 base_buffer = current_buffer->base_buffer; |
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
471 |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
472 /* If this records an obsolete save |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
473 (not matching the actual disk file) |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
474 then don't mark unmodified. */ |
10300
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
475 if (mod_time != base_buffer->modtime) |
12649
43434a01d442
(Fprimitive_undo): Don't end inner loop
Richard M. Stallman <rms@gnu.org>
parents:
12088
diff
changeset
|
476 continue; |
1598
3e9dadf2d13c
* undo.c (Fprimitive_undo): Remove whitespace in front of #ifdef
Jim Blandy <jimb@redhat.com>
parents:
1524
diff
changeset
|
477 #ifdef CLASH_DETECTION |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
478 Funlock_buffer (); |
1598
3e9dadf2d13c
* undo.c (Fprimitive_undo): Remove whitespace in front of #ifdef
Jim Blandy <jimb@redhat.com>
parents:
1524
diff
changeset
|
479 #endif /* CLASH_DETECTION */ |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
480 Fset_buffer_modified_p (Qnil); |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
481 } |
3687
54381151027d
(record_delete): Always use XFASTINT on sbeg.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
482 else if (EQ (car, Qnil)) |
1968
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
483 { |
3687
54381151027d
(record_delete): Always use XFASTINT on sbeg.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
484 /* 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
|
485 Lisp_Object beg, end, prop, val; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
486 |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
487 prop = Fcar (cdr); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
488 cdr = Fcdr (cdr); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
489 val = Fcar (cdr); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
490 cdr = Fcdr (cdr); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
491 beg = Fcar (cdr); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
492 end = Fcdr (cdr); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
493 |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
494 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
|
495 } |
9108
c0287cefc0f8
(record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
7671
diff
changeset
|
496 else if (INTEGERP (car) && INTEGERP (cdr)) |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
497 { |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
498 /* 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
|
499 |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
500 if (XINT (car) < BEGV |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
501 || XINT (cdr) > ZV) |
223 | 502 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
|
503 /* 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
|
504 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
|
505 Fgoto_char (car); |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
506 Fdelete_region (car, cdr); |
223 | 507 } |
9108
c0287cefc0f8
(record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
7671
diff
changeset
|
508 else if (STRINGP (car) && INTEGERP (cdr)) |
223 | 509 { |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
510 /* 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
|
511 Lisp_Object membuf; |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
512 int pos = XINT (cdr); |
544 | 513 |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
514 membuf = car; |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
515 if (pos < 0) |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
516 { |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
517 if (-pos < BEGV || -pos > ZV) |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
518 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
|
519 SET_PT (-pos); |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
520 Finsert (1, &membuf); |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
521 } |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
522 else |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
523 { |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
524 if (pos < BEGV || pos > ZV) |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
525 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
|
526 SET_PT (pos); |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
527 |
17447
dc2cb454b330
(Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
528 /* Now that we record marker adjustments |
dc2cb454b330
(Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
529 (caused by deletion) for undo, |
dc2cb454b330
(Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
530 we should always insert after markers, |
dc2cb454b330
(Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
531 so that undoing the marker adjustments |
dc2cb454b330
(Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
532 put the markers back in the right place. */ |
dc2cb454b330
(Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
533 Finsert (1, &membuf); |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
534 SET_PT (pos); |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
535 } |
223 | 536 } |
14480
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
537 else if (MARKERP (car) && INTEGERP (cdr)) |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
538 { |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
539 /* (MARKER . INTEGER) means a marker MARKER |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
540 was adjusted by INTEGER. */ |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
541 if (XMARKER (car)->buffer) |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
542 Fset_marker (car, |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
543 make_number (marker_position (car) - XINT (cdr)), |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
544 Fmarker_buffer (car)); |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
545 } |
223 | 546 } |
547 } | |
548 arg--; | |
549 } | |
550 | |
7671
31d444fcae24
(Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents:
7395
diff
changeset
|
551 UNGCPRO; |
3696
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
552 return unbind_to (count, list); |
223 | 553 } |
554 | |
21514 | 555 void |
223 | 556 syms_of_undo () |
557 { | |
3696
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
558 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
|
559 staticpro (&Qinhibit_read_only); |
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
560 |
6254
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
561 pending_boundary = Qnil; |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
562 staticpro (&pending_boundary); |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
563 |
223 | 564 defsubr (&Sprimitive_undo); |
565 defsubr (&Sundo_boundary); | |
566 } | |
52401 | 567 |
568 /* arch-tag: d546ee01-4aed-4ffb-bb8b-eefaae50d38a | |
569 (do not change this comment) */ |