annotate src/undo.c @ 59057:92202f639066

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