Mercurial > emacs
annotate src/undo.c @ 59633:536895642bb7
*** empty log message ***
author | Jay Belanger <jay.p.belanger@gmail.com> |
---|---|
date | Wed, 19 Jan 2005 05:58:28 +0000 |
parents | 27371673eba8 |
children | 06bae5eee9dc eac554634bfa |
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 |
59048
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
27 /* Limits controlling how much undo information to keep. */ |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
28 |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
29 EMACS_INT undo_limit; |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
30 EMACS_INT undo_strong_limit; |
59069
27371673eba8
(Vundo_outer_limit): Replaces undo_outer_limit. Uses changed.
Richard M. Stallman <rms@gnu.org>
parents:
59048
diff
changeset
|
31 |
27371673eba8
(Vundo_outer_limit): Replaces undo_outer_limit. Uses changed.
Richard M. Stallman <rms@gnu.org>
parents:
59048
diff
changeset
|
32 Lisp_Object Vundo_outer_limit; |
59048
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
33 |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
34 /* Function to call when undo_outer_limit is exceeded. */ |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
35 |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
36 Lisp_Object Vundo_outer_limit_function; |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
37 |
223 | 38 /* Last buffer for which undo information was recorded. */ |
39 Lisp_Object last_undo_buffer; | |
40 | |
3696
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
41 Lisp_Object Qinhibit_read_only; |
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
42 |
6254
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
43 /* 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
|
44 it also allocates the undo-boundary object |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
45 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
|
46 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
|
47 an undo-boundary. */ |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
48 Lisp_Object pending_boundary; |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
49 |
44391
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
50 /* 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
|
51 And prepare the undo info for recording a change. |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
52 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
|
53 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
|
54 |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
55 static void |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
56 record_point (pt) |
48326 | 57 int pt; |
44391
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 int at_boundary; |
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 /* 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
|
62 if (NILP (pending_boundary)) |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
63 pending_boundary = Fcons (Qnil, Qnil); |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
64 |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
65 if (!BUFFERP (last_undo_buffer) |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
66 || current_buffer != XBUFFER (last_undo_buffer)) |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
67 Fundo_boundary (); |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
68 XSETBUFFER (last_undo_buffer, current_buffer); |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
69 |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
70 if (CONSP (current_buffer->undo_list)) |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
71 { |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
72 /* 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
|
73 marker adjustment before undo boundary. */ |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
74 |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
75 Lisp_Object tail = current_buffer->undo_list, elt; |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
76 |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
77 while (1) |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
78 { |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
79 if (NILP (tail)) |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
80 elt = Qnil; |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
81 else |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
82 elt = XCAR (tail); |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
83 if (NILP (elt) || ! (CONSP (elt) && MARKERP (XCAR (elt)))) |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
84 break; |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
85 tail = XCDR (tail); |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
86 } |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
87 at_boundary = NILP (elt); |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
88 } |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
89 else |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
90 at_boundary = 1; |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
91 |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
92 if (MODIFF <= SAVE_MODIFF) |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
93 record_first_change (); |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
94 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48326
diff
changeset
|
95 /* 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
|
96 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
|
97 if (at_boundary |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
98 && last_point_position != pt |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
99 /* 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
|
100 && BUFFERP (last_point_position_buffer) |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
101 && current_buffer == XBUFFER (last_point_position_buffer)) |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
102 current_buffer->undo_list |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
103 = 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
|
104 } |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
105 |
223 | 106 /* Record an insertion that just happened or is about to happen, |
107 for LENGTH characters at position BEG. | |
108 (It is possible to record an insertion before or after the fact | |
109 because we don't need to record the contents.) */ | |
110 | |
20372
259194f66d40
(record_change, record_first_change,
Kenichi Handa <handa@m17n.org>
parents:
17447
diff
changeset
|
111 void |
223 | 112 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
|
113 int beg, length; |
223 | 114 { |
115 Lisp_Object lbeg, lend; | |
116 | |
2194
886a69457557
(record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents:
1968
diff
changeset
|
117 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
|
118 return; |
886a69457557
(record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents:
1968
diff
changeset
|
119 |
44391
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
120 record_point (beg); |
223 | 121 |
122 /* If this is following another insertion and consecutive with it | |
123 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
|
124 if (CONSP (current_buffer->undo_list)) |
223 | 125 { |
126 Lisp_Object elt; | |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
127 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
|
128 if (CONSP (elt) |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
129 && INTEGERP (XCAR (elt)) |
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
130 && INTEGERP (XCDR (elt)) |
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
131 && XINT (XCDR (elt)) == beg) |
223 | 132 { |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39798
diff
changeset
|
133 XSETCDR (elt, make_number (beg + length)); |
223 | 134 return; |
135 } | |
136 } | |
137 | |
12088
f0c9d02fb6e4
(record_insert): Change args to be ints, not Lisp_Objects.
Karl Heuer <kwzh@gnu.org>
parents:
10300
diff
changeset
|
138 XSETFASTINT (lbeg, beg); |
f0c9d02fb6e4
(record_insert): Change args to be ints, not Lisp_Objects.
Karl Heuer <kwzh@gnu.org>
parents:
10300
diff
changeset
|
139 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
|
140 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
|
141 current_buffer->undo_list); |
223 | 142 } |
143 | |
144 /* 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
|
145 of the characters in STRING, at location BEG. */ |
223 | 146 |
20373
b6c215dec8c8
(record_delete, record_marker_adjustment): Declare them as void.
Kenichi Handa <handa@m17n.org>
parents:
20372
diff
changeset
|
147 void |
21237
c5a8ee5b9b39
(record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents:
20373
diff
changeset
|
148 record_delete (beg, string) |
c5a8ee5b9b39
(record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents:
20373
diff
changeset
|
149 int beg; |
c5a8ee5b9b39
(record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents:
20373
diff
changeset
|
150 Lisp_Object string; |
223 | 151 { |
21237
c5a8ee5b9b39
(record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents:
20373
diff
changeset
|
152 Lisp_Object sbeg; |
223 | 153 |
2194
886a69457557
(record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents:
1968
diff
changeset
|
154 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
|
155 return; |
886a69457557
(record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents:
1968
diff
changeset
|
156 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46285
diff
changeset
|
157 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
|
158 { |
44391
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
159 XSETINT (sbeg, -beg); |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
160 record_point (PT); |
21272
b1bc69132f55
(record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents:
21237
diff
changeset
|
161 } |
b1bc69132f55
(record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents:
21237
diff
changeset
|
162 else |
44391
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
163 { |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
164 XSETFASTINT (sbeg, beg); |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
165 record_point (beg); |
0abb30765386
(record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
166 } |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
167 |
223 | 168 current_buffer->undo_list |
21237
c5a8ee5b9b39
(record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents:
20373
diff
changeset
|
169 = Fcons (Fcons (string, sbeg), current_buffer->undo_list); |
223 | 170 } |
171 | |
14480
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
172 /* 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
|
173 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
|
174 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
|
175 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
|
176 |
20373
b6c215dec8c8
(record_delete, record_marker_adjustment): Declare them as void.
Kenichi Handa <handa@m17n.org>
parents:
20372
diff
changeset
|
177 void |
14480
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
178 record_marker_adjustment (marker, adjustment) |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
179 Lisp_Object marker; |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
180 int adjustment; |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
181 { |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
182 if (EQ (current_buffer->undo_list, Qt)) |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
183 return; |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
184 |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
185 /* 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
|
186 if (NILP (pending_boundary)) |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
187 pending_boundary = Fcons (Qnil, Qnil); |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
188 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48326
diff
changeset
|
189 if (!BUFFERP (last_undo_buffer) |
30961
78ce106d272e
(record_first_change, record_marker_adjustment): Don'use
Gerd Moellmann <gerd@gnu.org>
parents:
30682
diff
changeset
|
190 || current_buffer != XBUFFER (last_undo_buffer)) |
14480
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
191 Fundo_boundary (); |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
192 XSETBUFFER (last_undo_buffer, current_buffer); |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
193 |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
194 current_buffer->undo_list |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
195 = Fcons (Fcons (marker, make_number (adjustment)), |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
196 current_buffer->undo_list); |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
197 } |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
198 |
223 | 199 /* Record that a replacement is about to take place, |
200 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
|
201 The replacement must not change the number of characters. */ |
223 | 202 |
20373
b6c215dec8c8
(record_delete, record_marker_adjustment): Declare them as void.
Kenichi Handa <handa@m17n.org>
parents:
20372
diff
changeset
|
203 void |
223 | 204 record_change (beg, length) |
205 int beg, length; | |
206 { | |
21237
c5a8ee5b9b39
(record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents:
20373
diff
changeset
|
207 record_delete (beg, make_buffer_string (beg, beg + length, 1)); |
223 | 208 record_insert (beg, length); |
209 } | |
210 | |
211 /* Record that an unmodified buffer is about to be changed. | |
212 Record the file modification date so that when undoing this entry | |
213 we can tell whether it is obsolete because the file was saved again. */ | |
214 | |
20372
259194f66d40
(record_change, record_first_change,
Kenichi Handa <handa@m17n.org>
parents:
17447
diff
changeset
|
215 void |
223 | 216 record_first_change () |
217 { | |
218 Lisp_Object high, low; | |
10300
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
219 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
|
220 |
099857a46901
(record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
221 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
|
222 return; |
099857a46901
(record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
223 |
30961
78ce106d272e
(record_first_change, record_marker_adjustment): Don'use
Gerd Moellmann <gerd@gnu.org>
parents:
30682
diff
changeset
|
224 if (!BUFFERP (last_undo_buffer) |
78ce106d272e
(record_first_change, record_marker_adjustment): Don'use
Gerd Moellmann <gerd@gnu.org>
parents:
30682
diff
changeset
|
225 || 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
|
226 Fundo_boundary (); |
9281
05b2bd5d5559
(record_insert, record_delete, record_first_change, record_property_change):
Karl Heuer <kwzh@gnu.org>
parents:
9108
diff
changeset
|
227 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
|
228 |
10300
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
229 if (base_buffer->base_buffer) |
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
230 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
|
231 |
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
232 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
|
233 XSETFASTINT (low, base_buffer->modtime & 0xffff); |
223 | 234 current_buffer->undo_list = Fcons (Fcons (Qt, Fcons (high, low)), current_buffer->undo_list); |
235 } | |
236 | |
1968
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
237 /* 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
|
238 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
|
239 |
20372
259194f66d40
(record_change, record_first_change,
Kenichi Handa <handa@m17n.org>
parents:
17447
diff
changeset
|
240 void |
1968
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
241 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
|
242 int beg, length; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
243 Lisp_Object prop, value, buffer; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
244 { |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
245 Lisp_Object lbeg, lend, entry; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
246 struct buffer *obuf = current_buffer; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
247 int boundary = 0; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
248 |
5762
099857a46901
(record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
249 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
|
250 return; |
886a69457557
(record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents:
1968
diff
changeset
|
251 |
6254
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
252 /* 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
|
253 if (NILP (pending_boundary)) |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
254 pending_boundary = Fcons (Qnil, Qnil); |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
255 |
1968
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
256 if (!EQ (buffer, last_undo_buffer)) |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
257 boundary = 1; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
258 last_undo_buffer = buffer; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
259 |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
260 /* 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
|
261 current_buffer = XBUFFER (buffer); |
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 if (boundary) |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
264 Fundo_boundary (); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
265 |
10300
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
266 if (MODIFF <= SAVE_MODIFF) |
1968
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
267 record_first_change (); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
268 |
9281
05b2bd5d5559
(record_insert, record_delete, record_first_change, record_property_change):
Karl Heuer <kwzh@gnu.org>
parents:
9108
diff
changeset
|
269 XSETINT (lbeg, beg); |
05b2bd5d5559
(record_insert, record_delete, record_first_change, record_property_change):
Karl Heuer <kwzh@gnu.org>
parents:
9108
diff
changeset
|
270 XSETINT (lend, beg + length); |
1968
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
271 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
|
272 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
|
273 |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
274 current_buffer = obuf; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
275 } |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
276 |
223 | 277 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
|
278 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
|
279 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
|
280 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
|
281 () |
223 | 282 { |
283 Lisp_Object tem; | |
284 if (EQ (current_buffer->undo_list, Qt)) | |
285 return Qnil; | |
286 tem = Fcar (current_buffer->undo_list); | |
485 | 287 if (!NILP (tem)) |
6254
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
288 { |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
289 /* 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
|
290 if (!NILP (pending_boundary)) |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
291 { |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
292 /* 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
|
293 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
|
294 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
|
295 current_buffer->undo_list = pending_boundary; |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
296 pending_boundary = Qnil; |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
297 } |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
298 else |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
299 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
|
300 } |
223 | 301 return Qnil; |
302 } | |
303 | |
304 /* At garbage collection time, make an undo list shorter at the end, | |
59048
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
305 returning the truncated list. How this is done depends on the |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
306 variables undo-limit, undo-strong-limit and undo-outer-limit. |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
307 In some cases this works by calling undo-outer-limit-function. */ |
223 | 308 |
59048
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
309 void |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
310 truncate_undo_list (b) |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
311 struct buffer *b; |
223 | 312 { |
59048
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
313 Lisp_Object list; |
223 | 314 Lisp_Object prev, next, last_boundary; |
315 int size_so_far = 0; | |
316 | |
59048
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
317 /* Make sure that calling undo-outer-limit-function |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
318 won't cause another GC. */ |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
319 int count = inhibit_garbage_collection (); |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
320 |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
321 /* Make the buffer current to get its local values of variables such |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
322 as undo_limit. Also so that Vundo_outer_limit_function can |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
323 tell which buffer to operate on. */ |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
324 record_unwind_protect (set_buffer_if_live, Fcurrent_buffer ()); |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
325 set_buffer_internal (b); |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
326 |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
327 list = b->undo_list; |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
328 |
223 | 329 prev = Qnil; |
330 next = list; | |
331 last_boundary = Qnil; | |
332 | |
59048
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
333 /* If the first element is an undo boundary, skip past it. */ |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
334 if (CONSP (next) && NILP (XCAR (next))) |
223 | 335 { |
336 /* Add in the space occupied by this element and its chain link. */ | |
337 size_so_far += sizeof (struct Lisp_Cons); | |
338 | |
339 /* Advance to next element. */ | |
340 prev = next; | |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
341 next = XCDR (next); |
223 | 342 } |
55839
9e7829a684df
(truncate_undo_list): New arg LIMITSIZE.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
343 |
59048
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
344 /* Always preserve at least the most recent undo record |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
345 unless it is really horribly big. |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
346 |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
347 Skip, skip, skip the undo, skip, skip, skip the undo, |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
348 Skip, skip, skip the undo, skip to the undo bound'ry. */ |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
349 |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
350 while (CONSP (next) && ! NILP (XCAR (next))) |
223 | 351 { |
352 Lisp_Object elt; | |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
353 elt = XCAR (next); |
223 | 354 |
355 /* Add in the space occupied by this element and its chain link. */ | |
356 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
|
357 if (CONSP (elt)) |
223 | 358 { |
359 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
|
360 if (STRINGP (XCAR (elt))) |
223 | 361 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
|
362 + SCHARS (XCAR (elt))); |
223 | 363 } |
364 | |
365 /* Advance to next element. */ | |
366 prev = next; | |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
367 next = XCDR (next); |
223 | 368 } |
55839
9e7829a684df
(truncate_undo_list): New arg LIMITSIZE.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
369 |
59048
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
370 /* If by the first boundary we have already passed undo_outer_limit, |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
371 we're heading for memory full, so offer to clear out the list. */ |
59069
27371673eba8
(Vundo_outer_limit): Replaces undo_outer_limit. Uses changed.
Richard M. Stallman <rms@gnu.org>
parents:
59048
diff
changeset
|
372 if (INTEGERP (Vundo_outer_limit) |
27371673eba8
(Vundo_outer_limit): Replaces undo_outer_limit. Uses changed.
Richard M. Stallman <rms@gnu.org>
parents:
59048
diff
changeset
|
373 && size_so_far > XINT (Vundo_outer_limit) |
59048
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
374 && !NILP (Vundo_outer_limit_function)) |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
375 { |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
376 Lisp_Object temp = last_undo_buffer; |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
377 |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
378 /* Normally the function this calls is undo-outer-limit-truncate. */ |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
379 if (! NILP (call1 (Vundo_outer_limit_function, |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
380 make_number (size_so_far)))) |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
381 { |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
382 /* The function is responsible for making |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
383 any desired changes in buffer-undo-list. */ |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
384 unbind_to (count, Qnil); |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
385 return; |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
386 } |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
387 /* That function probably used the minibuffer, and if so, that |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
388 changed last_undo_buffer. Change it back so that we don't |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
389 force next change to make an undo boundary here. */ |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
390 last_undo_buffer = temp; |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
391 } |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
392 |
9108
c0287cefc0f8
(record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
7671
diff
changeset
|
393 if (CONSP (next)) |
223 | 394 last_boundary = prev; |
395 | |
59048
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
396 /* Keep additional undo data, if it fits in the limits. */ |
9108
c0287cefc0f8
(record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
7671
diff
changeset
|
397 while (CONSP (next)) |
223 | 398 { |
399 Lisp_Object elt; | |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
400 elt = XCAR (next); |
223 | 401 |
402 /* When we get to a boundary, decide whether to truncate | |
59048
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
403 either before or after it. The lower threshold, undo_limit, |
223 | 404 tells us to truncate after it. If its size pushes past |
59048
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
405 the higher threshold undo_strong_limit, we truncate before it. */ |
485 | 406 if (NILP (elt)) |
223 | 407 { |
59048
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
408 if (size_so_far > undo_strong_limit) |
223 | 409 break; |
410 last_boundary = prev; | |
59048
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
411 if (size_so_far > undo_limit) |
223 | 412 break; |
413 } | |
414 | |
415 /* Add in the space occupied by this element and its chain link. */ | |
416 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
|
417 if (CONSP (elt)) |
223 | 418 { |
419 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
|
420 if (STRINGP (XCAR (elt))) |
223 | 421 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
|
422 + SCHARS (XCAR (elt))); |
223 | 423 } |
424 | |
425 /* Advance to next element. */ | |
426 prev = next; | |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
21514
diff
changeset
|
427 next = XCDR (next); |
223 | 428 } |
429 | |
430 /* If we scanned the whole list, it is short enough; don't change it. */ | |
485 | 431 if (NILP (next)) |
59048
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
432 ; |
223 | 433 /* Truncate at the boundary where we decided to truncate. */ |
59048
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
434 else if (!NILP (last_boundary)) |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
435 XSETCDR (last_boundary, Qnil); |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
436 /* There's nothing we decided to keep, so clear it out. */ |
223 | 437 else |
59048
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
438 b->undo_list = Qnil; |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
439 |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
440 unbind_to (count, Qnil); |
223 | 441 } |
442 | |
443 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
|
444 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
|
445 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
|
446 (n, list) |
3719
695181e4bc20
(Fprimitive_undo): Rename arg to N to avoid conflict.
Richard M. Stallman <rms@gnu.org>
parents:
3696
diff
changeset
|
447 Lisp_Object n, list; |
223 | 448 { |
7671
31d444fcae24
(Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents:
7395
diff
changeset
|
449 struct gcpro gcpro1, gcpro2; |
31d444fcae24
(Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents:
7395
diff
changeset
|
450 Lisp_Object next; |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
44391
diff
changeset
|
451 int count = SPECPDL_INDEX (); |
7671
31d444fcae24
(Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents:
7395
diff
changeset
|
452 register int arg; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48326
diff
changeset
|
453 |
223 | 454 #if 0 /* This is a good feature, but would make undo-start |
455 unable to do what is expected. */ | |
456 Lisp_Object tem; | |
457 | |
458 /* If the head of the list is a boundary, it is the boundary | |
459 preceding this command. Get rid of it and don't count it. */ | |
460 tem = Fcar (list); | |
485 | 461 if (NILP (tem)) |
223 | 462 list = Fcdr (list); |
463 #endif | |
464 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40123
diff
changeset
|
465 CHECK_NUMBER (n); |
7671
31d444fcae24
(Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents:
7395
diff
changeset
|
466 arg = XINT (n); |
31d444fcae24
(Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents:
7395
diff
changeset
|
467 next = Qnil; |
31d444fcae24
(Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents:
7395
diff
changeset
|
468 GCPRO2 (next, list); |
31d444fcae24
(Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents:
7395
diff
changeset
|
469 |
37527
d585b711c8d2
(Fprimitive_undo): In a writable buffer, enable undoing
Gerd Moellmann <gerd@gnu.org>
parents:
34965
diff
changeset
|
470 /* 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
|
471 because of text properties. */ |
d585b711c8d2
(Fprimitive_undo): In a writable buffer, enable undoing
Gerd Moellmann <gerd@gnu.org>
parents:
34965
diff
changeset
|
472 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
|
473 specbind (Qinhibit_read_only, Qt); |
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
474 |
34794
12ca043196d7
(Fprimitive_undo): Bind `inhibit-point-motion-hooks' to t.
Gerd Moellmann <gerd@gnu.org>
parents:
34169
diff
changeset
|
475 /* 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
|
476 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
|
477 |
223 | 478 while (arg > 0) |
479 { | |
39798
d54a90934144
(Fprimitive_undo): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37527
diff
changeset
|
480 while (CONSP (list)) |
223 | 481 { |
39798
d54a90934144
(Fprimitive_undo): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37527
diff
changeset
|
482 next = XCAR (list); |
d54a90934144
(Fprimitive_undo): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37527
diff
changeset
|
483 list = XCDR (list); |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
484 /* Exit inner loop at undo boundary. */ |
485 | 485 if (NILP (next)) |
223 | 486 break; |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
487 /* 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
|
488 if (INTEGERP (next)) |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
489 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
|
490 else if (CONSP (next)) |
223 | 491 { |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
492 Lisp_Object car, cdr; |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
493 |
39798
d54a90934144
(Fprimitive_undo): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37527
diff
changeset
|
494 car = XCAR (next); |
d54a90934144
(Fprimitive_undo): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37527
diff
changeset
|
495 cdr = XCDR (next); |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
496 if (EQ (car, Qt)) |
223 | 497 { |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
498 /* 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
|
499 Lisp_Object high, low; |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
500 int mod_time; |
10300
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
501 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
|
502 |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
503 high = Fcar (cdr); |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
504 low = Fcdr (cdr); |
3687
54381151027d
(record_delete): Always use XFASTINT on sbeg.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
505 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
|
506 |
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
507 if (current_buffer->base_buffer) |
323ad02feb1e
(Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents:
9322
diff
changeset
|
508 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
|
509 |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
510 /* If this records an obsolete save |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
511 (not matching the actual disk file) |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
512 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
|
513 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
|
514 continue; |
1598
3e9dadf2d13c
* undo.c (Fprimitive_undo): Remove whitespace in front of #ifdef
Jim Blandy <jimb@redhat.com>
parents:
1524
diff
changeset
|
515 #ifdef CLASH_DETECTION |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
516 Funlock_buffer (); |
1598
3e9dadf2d13c
* undo.c (Fprimitive_undo): Remove whitespace in front of #ifdef
Jim Blandy <jimb@redhat.com>
parents:
1524
diff
changeset
|
517 #endif /* CLASH_DETECTION */ |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
518 Fset_buffer_modified_p (Qnil); |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
519 } |
3687
54381151027d
(record_delete): Always use XFASTINT on sbeg.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
520 else if (EQ (car, Qnil)) |
1968
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
521 { |
3687
54381151027d
(record_delete): Always use XFASTINT on sbeg.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
522 /* 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
|
523 Lisp_Object beg, end, prop, val; |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
524 |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
525 prop = Fcar (cdr); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
526 cdr = Fcdr (cdr); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
527 val = Fcar (cdr); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
528 cdr = Fcdr (cdr); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
529 beg = Fcar (cdr); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
530 end = Fcdr (cdr); |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
531 |
de0a0ed7318e
(record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents:
1598
diff
changeset
|
532 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
|
533 } |
9108
c0287cefc0f8
(record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
7671
diff
changeset
|
534 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
|
535 { |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
536 /* 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
|
537 |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
538 if (XINT (car) < BEGV |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
539 || XINT (cdr) > ZV) |
223 | 540 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
|
541 /* 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
|
542 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
|
543 Fgoto_char (car); |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
544 Fdelete_region (car, cdr); |
223 | 545 } |
9108
c0287cefc0f8
(record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
7671
diff
changeset
|
546 else if (STRINGP (car) && INTEGERP (cdr)) |
223 | 547 { |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
548 /* 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
|
549 Lisp_Object membuf; |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
550 int pos = XINT (cdr); |
544 | 551 |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
552 membuf = car; |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
553 if (pos < 0) |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
554 { |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
555 if (-pos < BEGV || -pos > ZV) |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
556 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
|
557 SET_PT (-pos); |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
558 Finsert (1, &membuf); |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
559 } |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
560 else |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
561 { |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
562 if (pos < BEGV || pos > ZV) |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
563 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
|
564 SET_PT (pos); |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
565 |
17447
dc2cb454b330
(Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
566 /* Now that we record marker adjustments |
dc2cb454b330
(Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
567 (caused by deletion) for undo, |
dc2cb454b330
(Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
568 we should always insert after markers, |
dc2cb454b330
(Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
569 so that undoing the marker adjustments |
dc2cb454b330
(Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
570 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
|
571 Finsert (1, &membuf); |
1248
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
572 SET_PT (pos); |
68c77558d34b
(record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents:
970
diff
changeset
|
573 } |
223 | 574 } |
14480
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
575 else if (MARKERP (car) && INTEGERP (cdr)) |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
576 { |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
577 /* (MARKER . INTEGER) means a marker MARKER |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
578 was adjusted by INTEGER. */ |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
579 if (XMARKER (car)->buffer) |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
580 Fset_marker (car, |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
581 make_number (marker_position (car) - XINT (cdr)), |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
582 Fmarker_buffer (car)); |
50954bb380b6
(record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
583 } |
223 | 584 } |
585 } | |
586 arg--; | |
587 } | |
588 | |
7671
31d444fcae24
(Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents:
7395
diff
changeset
|
589 UNGCPRO; |
3696
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
590 return unbind_to (count, list); |
223 | 591 } |
592 | |
21514 | 593 void |
223 | 594 syms_of_undo () |
595 { | |
3696
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
596 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
|
597 staticpro (&Qinhibit_read_only); |
aa9310f06c0f
(syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents:
3687
diff
changeset
|
598 |
6254
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
599 pending_boundary = Qnil; |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
600 staticpro (&pending_boundary); |
a147d798ed0d
(syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents:
6180
diff
changeset
|
601 |
223 | 602 defsubr (&Sprimitive_undo); |
603 defsubr (&Sundo_boundary); | |
59048
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
604 |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
605 DEFVAR_INT ("undo-limit", &undo_limit, |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
606 doc: /* Keep no more undo information once it exceeds this size. |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
607 This limit is applied when garbage collection happens. |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
608 When a previous command increases the total undo list size past this |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
609 value, the earlier commands that came before it are forgotten. |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
610 |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
611 The size is counted as the number of bytes occupied, |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
612 which includes both saved text and other data. */); |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
613 undo_limit = 20000; |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
614 |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
615 DEFVAR_INT ("undo-strong-limit", &undo_strong_limit, |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
616 doc: /* Don't keep more than this much size of undo information. |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
617 This limit is applied when garbage collection happens. |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
618 When a previous command increases the total undo list size past this |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
619 value, that command and the earlier commands that came before it are forgotten. |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
620 However, the most recent buffer-modifying command's undo info |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
621 is never discarded for this reason. |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
622 |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
623 The size is counted as the number of bytes occupied, |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
624 which includes both saved text and other data. */); |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
625 undo_strong_limit = 30000; |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
626 |
59069
27371673eba8
(Vundo_outer_limit): Replaces undo_outer_limit. Uses changed.
Richard M. Stallman <rms@gnu.org>
parents:
59048
diff
changeset
|
627 DEFVAR_LISP ("undo-outer-limit", &Vundo_outer_limit, |
59048
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
628 doc: /* Outer limit on size of undo information for one command. |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
629 At garbage collection time, if the current command has produced |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
630 more than this much undo information, it asks you whether to delete |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
631 the information. This is a last-ditch limit to prevent memory overflow. |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
632 |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
633 The size is counted as the number of bytes occupied, |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
634 which includes both saved text and other data. |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
635 |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
636 In fact, this calls the function which is the value of |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
637 `undo-outer-limit-function' with one argument, the size. |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
638 The text above describes the behavior of the function |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
639 that variable usually specifies. */); |
59069
27371673eba8
(Vundo_outer_limit): Replaces undo_outer_limit. Uses changed.
Richard M. Stallman <rms@gnu.org>
parents:
59048
diff
changeset
|
640 Vundo_outer_limit = make_number (300000); |
59048
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
641 |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
642 DEFVAR_LISP ("undo-outer-limit-function", &Vundo_outer_limit_function, |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
643 doc: /* Function to call when an undo list exceeds `undo-outer-limit'. |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
644 This function is called with one argument, the current undo list size |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
645 for the most recent command (since the last undo boundary). |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
646 If the function returns t, that means truncation has been fully handled. |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
647 If it returns nil, the other forms of truncation are done. |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
648 |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
649 Garbage collection is inhibited around the call to this function, |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
650 so it must make sure not to do a lot of consing. */); |
2daab60919ed
(truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents:
55839
diff
changeset
|
651 Vundo_outer_limit_function = Qnil; |
223 | 652 } |
52401 | 653 |
654 /* arch-tag: d546ee01-4aed-4ffb-bb8b-eefaae50d38a | |
655 (do not change this comment) */ |