annotate src/undo.c @ 22723:04b653d7f842

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