Mercurial > emacs
annotate src/undo.c @ 32000:41462e513231
(updating_frame): Declare extern.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Fri, 29 Sep 2000 13:19:24 +0000 |
parents | 78ce106d272e |
children | 8d46095169e8 |
rev | line source |
---|---|
223 | 1 /* undo handling for GNU Emacs. |
7307 | 2 Copyright (C) 1990, 1993, 1994 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 |
223 | 39 /* Record an insertion that just happened or is about to happen, |
40 for LENGTH characters at position BEG. | |
41 (It is possible to record an insertion before or after the fact | |
42 because we don't need to record the contents.) */ | |
43 | |
20372
259194f66d40
(record_change, record_first_change,
Kenichi Handa <handa@m17n.org>
parents:
17447
diff
changeset
|
44 void |
223 | 45 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
|
46 int beg, length; |
223 | 47 { |
48 Lisp_Object lbeg, lend; | |
49 | |
2194
886a69457557
(record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents:
1968
diff
changeset
|
50 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
|
51 return; |
886a69457557
(record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents:
1968
diff
changeset
|
52 |
6254
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
53 /* 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
|
54 if (NILP (pending_boundary)) |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
55 pending_boundary = Fcons (Qnil, Qnil); |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
56 |
28417
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
26404
diff
changeset
|
57 if (!BUFFERP (last_undo_buffer) |
4b675266db04
* lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents:
26404
diff
changeset
|
58 || current_buffer != XBUFFER (last_undo_buffer)) |
223 | 59 Fundo_boundary (); |
9281
05b2bd5d5559
(record_insert, record_delete, record_first_change, record_property_change):
Karl Heuer <kwzh@gnu.org>
parents:
9108
diff
changeset
|
60 XSETBUFFER (last_undo_buffer, current_buffer); |
223 | 61 |
10300
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
62 if (MODIFF <= SAVE_MODIFF) |
223 | 63 record_first_change (); |
64 | |
65 /* If this is following another insertion and consecutive with it | |
66 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
|
67 if (CONSP (current_buffer->undo_list)) |
223 | 68 { |
69 Lisp_Object elt; | |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
70 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
|
71 if (CONSP (elt) |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
72 && INTEGERP (XCAR (elt)) |
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
73 && INTEGERP (XCDR (elt)) |
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
74 && XINT (XCDR (elt)) == beg) |
223 | 75 { |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
76 XSETINT (XCDR (elt), beg + length); |
223 | 77 return; |
78 } | |
79 } | |
80 | |
12088
f0c9d02fb6e4
(record_insert): Change args to be ints, not Lisp_Objects.
Karl Heuer <kwzh@gnu.org>
parents:
10300
diff
changeset
|
81 XSETFASTINT (lbeg, beg); |
f0c9d02fb6e4
(record_insert): Change args to be ints, not Lisp_Objects.
Karl Heuer <kwzh@gnu.org>
parents:
10300
diff
changeset
|
82 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
|
83 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
|
84 current_buffer->undo_list); |
223 | 85 } |
86 | |
87 /* 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
|
88 of the characters in STRING, at location BEG. */ |
223 | 89 |
20373
b6c215dec8c8
(record_delete, record_marker_adjustment): Declare them as void.
Kenichi Handa <handa@m17n.org>
parents:
20372
diff
changeset
|
90 void |
21237
c5a8ee5b9b39
(record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents:
20373
diff
changeset
|
91 record_delete (beg, string) |
c5a8ee5b9b39
(record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents:
20373
diff
changeset
|
92 int beg; |
c5a8ee5b9b39
(record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents:
20373
diff
changeset
|
93 Lisp_Object string; |
223 | 94 { |
21237
c5a8ee5b9b39
(record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents:
20373
diff
changeset
|
95 Lisp_Object sbeg; |
7395
99e9c133a752
(record_delete): Record the old point value only right after a boundary.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
96 int at_boundary; |
223 | 97 |
2194
886a69457557
(record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents:
1968
diff
changeset
|
98 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
|
99 return; |
886a69457557
(record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents:
1968
diff
changeset
|
100 |
6254
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
101 /* 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
|
102 if (NILP (pending_boundary)) |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
103 pending_boundary = Fcons (Qnil, Qnil); |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
104 |
223 | 105 if (current_buffer != XBUFFER (last_undo_buffer)) |
106 Fundo_boundary (); | |
9281
05b2bd5d5559
(record_insert, record_delete, record_first_change, record_property_change):
Karl Heuer <kwzh@gnu.org>
parents:
9108
diff
changeset
|
107 XSETBUFFER (last_undo_buffer, current_buffer); |
223 | 108 |
21272
b1bc69132f55
(record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents:
21237
diff
changeset
|
109 if (CONSP (current_buffer->undo_list)) |
b1bc69132f55
(record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents:
21237
diff
changeset
|
110 { |
b1bc69132f55
(record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents:
21237
diff
changeset
|
111 /* Set AT_BOUNDARY to 1 only when we have nothing other than |
b1bc69132f55
(record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents:
21237
diff
changeset
|
112 marker adjustment before undo boundary. */ |
b1bc69132f55
(record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents:
21237
diff
changeset
|
113 |
b1bc69132f55
(record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents:
21237
diff
changeset
|
114 Lisp_Object tail = current_buffer->undo_list, elt; |
b1bc69132f55
(record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents:
21237
diff
changeset
|
115 |
b1bc69132f55
(record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents:
21237
diff
changeset
|
116 while (1) |
b1bc69132f55
(record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents:
21237
diff
changeset
|
117 { |
28725
12d806a22931
(record_delete): If we hit the end of the undo list, stop picking elements
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
118 if (NILP (tail)) |
12d806a22931
(record_delete): If we hit the end of the undo list, stop picking elements
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
119 elt = Qnil; |
12d806a22931
(record_delete): If we hit the end of the undo list, stop picking elements
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
120 else |
12d806a22931
(record_delete): If we hit the end of the undo list, stop picking elements
Ken Raeburn <raeburn@raeburn.org>
parents:
28417
diff
changeset
|
121 elt = XCAR (tail); |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
122 if (NILP (elt) || ! (CONSP (elt) && MARKERP (XCAR (elt)))) |
21272
b1bc69132f55
(record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents:
21237
diff
changeset
|
123 break; |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
124 tail = XCDR (tail); |
21272
b1bc69132f55
(record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents:
21237
diff
changeset
|
125 } |
b1bc69132f55
(record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents:
21237
diff
changeset
|
126 at_boundary = NILP (elt); |
b1bc69132f55
(record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents:
21237
diff
changeset
|
127 } |
b1bc69132f55
(record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents:
21237
diff
changeset
|
128 else |
b1bc69132f55
(record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents:
21237
diff
changeset
|
129 at_boundary = 0; |
7395
99e9c133a752
(record_delete): Record the old point value only right after a boundary.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
130 |
10300
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
131 if (MODIFF <= SAVE_MODIFF) |
223 | 132 record_first_change (); |
133 | |
21237
c5a8ee5b9b39
(record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents:
20373
diff
changeset
|
134 if (PT == beg + XSTRING (string)->size) |
9281
05b2bd5d5559
(record_insert, record_delete, record_first_change, record_property_change):
Karl Heuer <kwzh@gnu.org>
parents:
9108
diff
changeset
|
135 XSETINT (sbeg, -beg); |
223 | 136 else |
9322
0dceca89f978
(record_delete, record_first_change): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9281
diff
changeset
|
137 XSETFASTINT (sbeg, beg); |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
138 |
7395
99e9c133a752
(record_delete): Record the old point value only right after a boundary.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
139 /* If we are just after an undo boundary, and |
99e9c133a752
(record_delete): Record the old point value only right after a boundary.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
140 point wasn't at start of deleted range, record where it was. */ |
99e9c133a752
(record_delete): Record the old point value only right after a boundary.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
141 if (at_boundary |
99e9c133a752
(record_delete): Record the old point value only right after a boundary.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
142 && last_point_position != XFASTINT (sbeg) |
30682
5583737fcf85
(record_delete): Make sure last_point_position_buffer is a buffer before
Ken Raeburn <raeburn@raeburn.org>
parents:
28725
diff
changeset
|
143 /* If we're called from batch mode, this could be nil. */ |
5583737fcf85
(record_delete): Make sure last_point_position_buffer is a buffer before
Ken Raeburn <raeburn@raeburn.org>
parents:
28725
diff
changeset
|
144 && BUFFERP (last_point_position_buffer) |
7395
99e9c133a752
(record_delete): Record the old point value only right after a boundary.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
145 && current_buffer == XBUFFER (last_point_position_buffer)) |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
146 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
|
147 = 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
|
148 |
223 | 149 current_buffer->undo_list |
21237
c5a8ee5b9b39
(record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents:
20373
diff
changeset
|
150 = Fcons (Fcons (string, sbeg), current_buffer->undo_list); |
223 | 151 } |
152 | |
14480
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
153 /* 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
|
154 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
|
155 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
|
156 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
|
157 |
20373
b6c215dec8c8
(record_delete, record_marker_adjustment): Declare them as void.
Kenichi Handa <handa@m17n.org>
parents:
20372
diff
changeset
|
158 void |
14480
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
159 record_marker_adjustment (marker, adjustment) |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
160 Lisp_Object marker; |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
161 int adjustment; |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
162 { |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
163 if (EQ (current_buffer->undo_list, Qt)) |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
164 return; |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
165 |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
166 /* 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
|
167 if (NILP (pending_boundary)) |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
168 pending_boundary = Fcons (Qnil, Qnil); |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
169 |
30961
78ce106d272e
(record_first_change, record_marker_adjustment): Don'use
Gerd Moellmann <gerd@gnu.org>
parents:
30682
diff
changeset
|
170 if (!BUFFERP (last_undo_buffer) |
78ce106d272e
(record_first_change, record_marker_adjustment): Don'use
Gerd Moellmann <gerd@gnu.org>
parents:
30682
diff
changeset
|
171 || current_buffer != XBUFFER (last_undo_buffer)) |
14480
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
172 Fundo_boundary (); |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
173 XSETBUFFER (last_undo_buffer, current_buffer); |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
174 |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
175 current_buffer->undo_list |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
176 = Fcons (Fcons (marker, make_number (adjustment)), |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
177 current_buffer->undo_list); |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
178 } |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
179 |
223 | 180 /* Record that a replacement is about to take place, |
181 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
|
182 The replacement must not change the number of characters. */ |
223 | 183 |
20373
b6c215dec8c8
(record_delete, record_marker_adjustment): Declare them as void.
Kenichi Handa <handa@m17n.org>
parents:
20372
diff
changeset
|
184 void |
223 | 185 record_change (beg, length) |
186 int beg, length; | |
187 { | |
21237
c5a8ee5b9b39
(record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents:
20373
diff
changeset
|
188 record_delete (beg, make_buffer_string (beg, beg + length, 1)); |
223 | 189 record_insert (beg, length); |
190 } | |
191 | |
192 /* Record that an unmodified buffer is about to be changed. | |
193 Record the file modification date so that when undoing this entry | |
194 we can tell whether it is obsolete because the file was saved again. */ | |
195 | |
20372
259194f66d40
(record_change, record_first_change,
Kenichi Handa <handa@m17n.org>
parents:
17447
diff
changeset
|
196 void |
223 | 197 record_first_change () |
198 { | |
199 Lisp_Object high, low; | |
10300
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
200 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
|
201 |
099857a46901
(record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
202 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
|
203 return; |
099857a46901
(record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
204 |
30961
78ce106d272e
(record_first_change, record_marker_adjustment): Don'use
Gerd Moellmann <gerd@gnu.org>
parents:
30682
diff
changeset
|
205 if (!BUFFERP (last_undo_buffer) |
78ce106d272e
(record_first_change, record_marker_adjustment): Don'use
Gerd Moellmann <gerd@gnu.org>
parents:
30682
diff
changeset
|
206 || 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
|
207 Fundo_boundary (); |
9281
05b2bd5d5559
(record_insert, record_delete, record_first_change, record_property_change):
Karl Heuer <kwzh@gnu.org>
parents:
9108
diff
changeset
|
208 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
|
209 |
10300
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
210 if (base_buffer->base_buffer) |
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
211 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
|
212 |
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
213 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
|
214 XSETFASTINT (low, base_buffer->modtime & 0xffff); |
223 | 215 current_buffer->undo_list = Fcons (Fcons (Qt, Fcons (high, low)), current_buffer->undo_list); |
216 } | |
217 | |
1968
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
218 /* 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
|
219 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
|
220 |
20372
259194f66d40
(record_change, record_first_change,
Kenichi Handa <handa@m17n.org>
parents:
17447
diff
changeset
|
221 void |
1968
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
222 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
|
223 int beg, length; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
224 Lisp_Object prop, value, buffer; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
225 { |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
226 Lisp_Object lbeg, lend, entry; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
227 struct buffer *obuf = current_buffer; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
228 int boundary = 0; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
229 |
5762
099857a46901
(record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
230 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
|
231 return; |
886a69457557
(record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents:
1968
diff
changeset
|
232 |
6254
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
233 /* 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
|
234 if (NILP (pending_boundary)) |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
235 pending_boundary = Fcons (Qnil, Qnil); |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
236 |
1968
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
237 if (!EQ (buffer, last_undo_buffer)) |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
238 boundary = 1; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
239 last_undo_buffer = buffer; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
240 |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
241 /* 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
|
242 current_buffer = XBUFFER (buffer); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
243 |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
244 if (boundary) |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
245 Fundo_boundary (); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
246 |
10300
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
247 if (MODIFF <= SAVE_MODIFF) |
1968
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
248 record_first_change (); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
249 |
9281
05b2bd5d5559
(record_insert, record_delete, record_first_change, record_property_change):
Karl Heuer <kwzh@gnu.org>
parents:
9108
diff
changeset
|
250 XSETINT (lbeg, beg); |
05b2bd5d5559
(record_insert, record_delete, record_first_change, record_property_change):
Karl Heuer <kwzh@gnu.org>
parents:
9108
diff
changeset
|
251 XSETINT (lend, beg + length); |
1968
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
252 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
|
253 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
|
254 |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
255 current_buffer = obuf; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
256 } |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
257 |
223 | 258 DEFUN ("undo-boundary", Fundo_boundary, Sundo_boundary, 0, 0, 0, |
259 "Mark a boundary between units of undo.\n\ | |
260 An undo command will stop at this point,\n\ | |
261 but another undo command will undo to the previous boundary.") | |
262 () | |
263 { | |
264 Lisp_Object tem; | |
265 if (EQ (current_buffer->undo_list, Qt)) | |
266 return Qnil; | |
267 tem = Fcar (current_buffer->undo_list); | |
485 | 268 if (!NILP (tem)) |
6254
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
269 { |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
270 /* 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
|
271 if (!NILP (pending_boundary)) |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
272 { |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
273 /* 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
|
274 use that one. */ |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
275 XCDR (pending_boundary) = current_buffer->undo_list; |
6254
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
276 current_buffer->undo_list = pending_boundary; |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
277 pending_boundary = Qnil; |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
278 } |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
279 else |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
280 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
|
281 } |
223 | 282 return Qnil; |
283 } | |
284 | |
285 /* At garbage collection time, make an undo list shorter at the end, | |
286 returning the truncated list. | |
287 MINSIZE and MAXSIZE are the limits on size allowed, as described below. | |
761 | 288 In practice, these are the values of undo-limit and |
289 undo-strong-limit. */ | |
223 | 290 |
291 Lisp_Object | |
292 truncate_undo_list (list, minsize, maxsize) | |
293 Lisp_Object list; | |
294 int minsize, maxsize; | |
295 { | |
296 Lisp_Object prev, next, last_boundary; | |
297 int size_so_far = 0; | |
298 | |
299 prev = Qnil; | |
300 next = list; | |
301 last_boundary = Qnil; | |
302 | |
303 /* Always preserve at least the most recent undo record. | |
241 | 304 If the first element is an undo boundary, skip past it. |
305 | |
306 Skip, skip, skip the undo, skip, skip, skip the undo, | |
970 | 307 Skip, skip, skip the undo, skip to the undo bound'ry. |
308 (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
|
309 if (CONSP (next) && NILP (XCAR (next))) |
223 | 310 { |
311 /* Add in the space occupied by this element and its chain link. */ | |
312 size_so_far += sizeof (struct Lisp_Cons); | |
313 | |
314 /* Advance to next element. */ | |
315 prev = next; | |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
316 next = XCDR (next); |
223 | 317 } |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
318 while (CONSP (next) && ! NILP (XCAR (next))) |
223 | 319 { |
320 Lisp_Object elt; | |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
321 elt = XCAR (next); |
223 | 322 |
323 /* Add in the space occupied by this element and its chain link. */ | |
324 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
|
325 if (CONSP (elt)) |
223 | 326 { |
327 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
|
328 if (STRINGP (XCAR (elt))) |
223 | 329 size_so_far += (sizeof (struct Lisp_String) - 1 |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
330 + XSTRING (XCAR (elt))->size); |
223 | 331 } |
332 | |
333 /* Advance to next element. */ | |
334 prev = next; | |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
335 next = XCDR (next); |
223 | 336 } |
9108
c0287cefc0f8
(record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
7671
diff
changeset
|
337 if (CONSP (next)) |
223 | 338 last_boundary = prev; |
339 | |
9108
c0287cefc0f8
(record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
7671
diff
changeset
|
340 while (CONSP (next)) |
223 | 341 { |
342 Lisp_Object elt; | |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
343 elt = XCAR (next); |
223 | 344 |
345 /* When we get to a boundary, decide whether to truncate | |
346 either before or after it. The lower threshold, MINSIZE, | |
347 tells us to truncate after it. If its size pushes past | |
348 the higher threshold MAXSIZE as well, we truncate before it. */ | |
485 | 349 if (NILP (elt)) |
223 | 350 { |
351 if (size_so_far > maxsize) | |
352 break; | |
353 last_boundary = prev; | |
354 if (size_so_far > minsize) | |
355 break; | |
356 } | |
357 | |
358 /* Add in the space occupied by this element and its chain link. */ | |
359 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
|
360 if (CONSP (elt)) |
223 | 361 { |
362 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
|
363 if (STRINGP (XCAR (elt))) |
223 | 364 size_so_far += (sizeof (struct Lisp_String) - 1 |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
365 + XSTRING (XCAR (elt))->size); |
223 | 366 } |
367 | |
368 /* Advance to next element. */ | |
369 prev = next; | |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
370 next = XCDR (next); |
223 | 371 } |
372 | |
373 /* If we scanned the whole list, it is short enough; don't change it. */ | |
485 | 374 if (NILP (next)) |
223 | 375 return list; |
376 | |
377 /* Truncate at the boundary where we decided to truncate. */ | |
485 | 378 if (!NILP (last_boundary)) |
223 | 379 { |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
380 XCDR (last_boundary) = Qnil; |
223 | 381 return list; |
382 } | |
383 else | |
384 return Qnil; | |
385 } | |
386 | |
387 DEFUN ("primitive-undo", Fprimitive_undo, Sprimitive_undo, 2, 2, 0, | |
388 "Undo N records from the front of the list LIST.\n\ | |
389 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
|
390 (n, list) |
695181e4bc20
(Fprimitive_undo): Rename arg to N to avoid conflict.
Richard M. Stallman <rms@gnu.org>
parents:
3696
diff
changeset
|
391 Lisp_Object n, list; |
223 | 392 { |
7671
31d444fcae24
(Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents:
7395
diff
changeset
|
393 struct gcpro gcpro1, gcpro2; |
31d444fcae24
(Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents:
7395
diff
changeset
|
394 Lisp_Object next; |
3696
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
395 int count = specpdl_ptr - specpdl; |
7671
31d444fcae24
(Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents:
7395
diff
changeset
|
396 register int arg; |
223 | 397 #if 0 /* This is a good feature, but would make undo-start |
398 unable to do what is expected. */ | |
399 Lisp_Object tem; | |
400 | |
401 /* If the head of the list is a boundary, it is the boundary | |
402 preceding this command. Get rid of it and don't count it. */ | |
403 tem = Fcar (list); | |
485 | 404 if (NILP (tem)) |
223 | 405 list = Fcdr (list); |
406 #endif | |
407 | |
7671
31d444fcae24
(Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents:
7395
diff
changeset
|
408 CHECK_NUMBER (n, 0); |
31d444fcae24
(Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents:
7395
diff
changeset
|
409 arg = XINT (n); |
31d444fcae24
(Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents:
7395
diff
changeset
|
410 next = Qnil; |
31d444fcae24
(Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents:
7395
diff
changeset
|
411 GCPRO2 (next, list); |
31d444fcae24
(Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents:
7395
diff
changeset
|
412 |
3696
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
413 /* 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
|
414 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
|
415 specbind (Qinhibit_read_only, Qt); |
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
416 |
223 | 417 while (arg > 0) |
418 { | |
419 while (1) | |
420 { | |
421 next = Fcar (list); | |
422 list = Fcdr (list); | |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
423 /* Exit inner loop at undo boundary. */ |
485 | 424 if (NILP (next)) |
223 | 425 break; |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
426 /* 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
|
427 if (INTEGERP (next)) |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
428 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
|
429 else if (CONSP (next)) |
223 | 430 { |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
431 Lisp_Object car, cdr; |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
432 |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
433 car = Fcar (next); |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
434 cdr = Fcdr (next); |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
435 if (EQ (car, Qt)) |
223 | 436 { |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
437 /* 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
|
438 Lisp_Object high, low; |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
439 int mod_time; |
10300
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
440 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
|
441 |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
442 high = Fcar (cdr); |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
443 low = Fcdr (cdr); |
3687
54381151027d
(record_delete): Always use XFASTINT on sbeg.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
444 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
|
445 |
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
446 if (current_buffer->base_buffer) |
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
447 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
|
448 |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
449 /* If this records an obsolete save |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
450 (not matching the actual disk file) |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
451 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
|
452 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
|
453 continue; |
1598
3e9dadf2d13c
* undo.c (Fprimitive_undo): Remove whitespace in front of #ifdef
Jim Blandy <jimb@redhat.com>
parents:
1524
diff
changeset
|
454 #ifdef CLASH_DETECTION |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
455 Funlock_buffer (); |
1598
3e9dadf2d13c
* undo.c (Fprimitive_undo): Remove whitespace in front of #ifdef
Jim Blandy <jimb@redhat.com>
parents:
1524
diff
changeset
|
456 #endif /* CLASH_DETECTION */ |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
457 Fset_buffer_modified_p (Qnil); |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
458 } |
3687
54381151027d
(record_delete): Always use XFASTINT on sbeg.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
459 else if (EQ (car, Qnil)) |
1968
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
460 { |
3687
54381151027d
(record_delete): Always use XFASTINT on sbeg.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
461 /* 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
|
462 Lisp_Object beg, end, prop, val; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
463 |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
464 prop = Fcar (cdr); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
465 cdr = Fcdr (cdr); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
466 val = Fcar (cdr); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
467 cdr = Fcdr (cdr); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
468 beg = Fcar (cdr); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
469 end = Fcdr (cdr); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
470 |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
471 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
|
472 } |
9108
c0287cefc0f8
(record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
7671
diff
changeset
|
473 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
|
474 { |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
475 /* 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
|
476 Lisp_Object end; |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
477 |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
478 if (XINT (car) < BEGV |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
479 || XINT (cdr) > ZV) |
223 | 480 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
|
481 /* 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
|
482 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
|
483 Fgoto_char (car); |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
484 Fdelete_region (car, cdr); |
223 | 485 } |
9108
c0287cefc0f8
(record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
7671
diff
changeset
|
486 else if (STRINGP (car) && INTEGERP (cdr)) |
223 | 487 { |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
488 /* 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
|
489 Lisp_Object membuf; |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
490 int pos = XINT (cdr); |
544 | 491 |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
492 membuf = car; |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
493 if (pos < 0) |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
494 { |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
495 if (-pos < BEGV || -pos > ZV) |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
496 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
|
497 SET_PT (-pos); |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
498 Finsert (1, &membuf); |
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 else |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
501 { |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
502 if (pos < BEGV || pos > ZV) |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
503 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
|
504 SET_PT (pos); |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
505 |
17447
dc2cb454b330
(Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
506 /* Now that we record marker adjustments |
dc2cb454b330
(Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
507 (caused by deletion) for undo, |
dc2cb454b330
(Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
508 we should always insert after markers, |
dc2cb454b330
(Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
509 so that undoing the marker adjustments |
dc2cb454b330
(Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
510 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
|
511 Finsert (1, &membuf); |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
512 SET_PT (pos); |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
513 } |
223 | 514 } |
14480
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
515 else if (MARKERP (car) && INTEGERP (cdr)) |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
516 { |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
517 /* (MARKER . INTEGER) means a marker MARKER |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
518 was adjusted by INTEGER. */ |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
519 if (XMARKER (car)->buffer) |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
520 Fset_marker (car, |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
521 make_number (marker_position (car) - XINT (cdr)), |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
522 Fmarker_buffer (car)); |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
523 } |
223 | 524 } |
525 } | |
526 arg--; | |
527 } | |
528 | |
7671
31d444fcae24
(Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents:
7395
diff
changeset
|
529 UNGCPRO; |
3696
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
530 return unbind_to (count, list); |
223 | 531 } |
532 | |
21514 | 533 void |
223 | 534 syms_of_undo () |
535 { | |
3696
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
536 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
|
537 staticpro (&Qinhibit_read_only); |
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
538 |
6254
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
539 pending_boundary = Qnil; |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
540 staticpro (&pending_boundary); |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
541 |
223 | 542 defsubr (&Sprimitive_undo); |
543 defsubr (&Sundo_boundary); | |
544 } |