annotate src/undo.c @ 373:6240c7796c7a r21-2b2

Import from CVS: tag r21-2b2
author cvs
date Mon, 13 Aug 2007 11:04:06 +0200
parents 558f606b08ae
children 74fd4e045ea6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1 /* undo handling for XEmacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2 Copyright (C) 1990, 1992, 1993, 1994 Free Software Foundation, Inc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4 This file is part of XEmacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6 XEmacs is free software; you can redistribute it and/or modify it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7 under the terms of the GNU General Public License as published by the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8 Free Software Foundation; either version 2, or (at your option) any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9 later version.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 XEmacs is distributed in the hope that it will be useful, but WITHOUT
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14 for more details.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 You should have received a copy of the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17 along with XEmacs; see the file COPYING. If not, write to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19 Boston, MA 02111-1307, USA. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
21 /* Synched up with: FSF 19.28. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
22
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
23 /* This file has been Mule-ized. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
24
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25 #include <config.h>
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
26 #include "lisp.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27 #include "buffer.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
28 #include "extents.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30 /* Maintained in event-stream.c */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
31 extern Bufpos last_point_position;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
32 extern Lisp_Object last_point_position_buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 /* Extent code needs to know about undo because the behavior of insert()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35 with regard to extents varies depending on whether we are inside
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36 an undo or not. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37 int inside_undo;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39 /* Last buffer for which undo information was recorded. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40 static Lisp_Object last_undo_buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42 Lisp_Object Qinhibit_read_only;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
43
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44 /* The first time a command records something for undo.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 it also allocates the undo-boundary object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46 which will be added to the list at the end of the command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47 This ensures we can't run out of space while trying to make
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48 an undo-boundary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 Lisp_Object pending_boundary;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52 undo_boundary (struct buffer *b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 Lisp_Object tem = Fcar (b->undo_list);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
55 if (!NILP (tem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
57 /* One way or another, cons nil onto the front of the undo list. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
58 if (CONSP (pending_boundary))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
59 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
60 /* If we have preallocated the cons cell to use here,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
61 use that one. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
62 XCDR (pending_boundary) = b->undo_list;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
63 b->undo_list = pending_boundary;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
64 pending_boundary = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
65 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
66 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
67 b->undo_list = Fcons (Qnil, b->undo_list);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
68 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73 undo_prelude (struct buffer *b, int hack_pending_boundary)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75 if (EQ (b->undo_list, Qt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 return (0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77
373
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 284
diff changeset
78 if (NILP (last_undo_buffer)
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 284
diff changeset
79 || (BUFFER_BASE_BUFFER (b)
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 284
diff changeset
80 != BUFFER_BASE_BUFFER (XBUFFER (last_undo_buffer))))
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 223
diff changeset
81 {
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 223
diff changeset
82 undo_boundary (b);
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 223
diff changeset
83 XSETBUFFER (last_undo_buffer, b);
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 223
diff changeset
84 }
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 167
diff changeset
85
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86 /* Allocate a cons cell to be the undo boundary after this command. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87 if (hack_pending_boundary && NILP (pending_boundary))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 pending_boundary = Fcons (Qnil, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90 if (BUF_MODIFF (b) <= BUF_SAVE_MODIFF (b))
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 223
diff changeset
91 {
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 223
diff changeset
92 /* Record that an unmodified buffer is about to be changed.
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 223
diff changeset
93 Record the file modification date so that when undoing this
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 223
diff changeset
94 entry we can tell whether it is obsolete because the file was
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 223
diff changeset
95 saved again. */
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 223
diff changeset
96 b->undo_list
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 223
diff changeset
97 = Fcons (Fcons (Qt,
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 223
diff changeset
98 Fcons (make_int ((b->modtime >> 16) & 0xffff),
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 223
diff changeset
99 make_int (b->modtime & 0xffff))),
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 223
diff changeset
100 b->undo_list);
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 223
diff changeset
101 }
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 223
diff changeset
102 return 1;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
104
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
105
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
107 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
108 restore_inside_undo (Lisp_Object val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
109 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
110 inside_undo = XINT (val);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
111 return val;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
112 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
113
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
114
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
115 /* Record an insertion that just happened or is about to happen,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
116 for LENGTH characters at position BEG.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
117 (It is possible to record an insertion before or after the fact
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
118 because we don't need to record the contents.) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
119
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
120 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
121 record_insert (struct buffer *b, Bufpos beg, Charcount length)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
122 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
123 if (!undo_prelude (b, 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
124 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
125
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
126 /* If this is following another insertion and consecutive with it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
127 in the buffer, combine the two. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
128 if (CONSP (b->undo_list))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
129 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
130 Lisp_Object elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
131 elt = XCAR (b->undo_list);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
132 if (CONSP (elt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
133 && INTP (XCAR (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
134 && INTP (XCDR (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
135 && XINT (XCDR (elt)) == beg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
136 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
137 XCDR (elt) = make_int (beg + length);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
138 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
139 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
140 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
141
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 167
diff changeset
142 b->undo_list = Fcons (Fcons (make_int (beg),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
143 make_int (beg + length)),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
144 b->undo_list);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
145 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
146
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
147 /* Record that a deletion is about to take place,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
148 for LENGTH characters at location BEG. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
149
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
150 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
151 record_delete (struct buffer *b, Bufpos beg, Charcount length)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
152 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
153 /* This function can GC */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
154 Lisp_Object sbeg;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
155 int at_boundary;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
156
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
157 if (!undo_prelude (b, 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
158 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
159
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
160 at_boundary = (CONSP (b->undo_list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
161 && NILP (XCAR (b->undo_list)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
162
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
163 if (BUF_PT (b) == beg + length)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
164 sbeg = make_int (-beg);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
165 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
166 sbeg = make_int (beg);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
167
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 167
diff changeset
168 /* If we are just after an undo boundary, and
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
169 point wasn't at start of deleted range, record where it was. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
170 if (at_boundary
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
171 && BUFFERP (last_point_position_buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
172 && b == XBUFFER (last_point_position_buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
173 && last_point_position != XINT (sbeg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
174 b->undo_list = Fcons (make_int (last_point_position), b->undo_list);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
175
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
176 b->undo_list = Fcons (Fcons (make_string_from_buffer (b, beg,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
177 length),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
178 sbeg),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
179 b->undo_list);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
180 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
181
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
182 /* Record that a replacement is about to take place,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
183 for LENGTH characters at location BEG.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
184 The replacement does not change the number of characters. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
185
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
186 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
187 record_change (struct buffer *b, Bufpos beg, Charcount length)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
188 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
189 record_delete (b, beg, length);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
190 record_insert (b, beg, length);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
191 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
192
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
193 /* Record that an EXTENT is about to be attached or detached in its buffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
194 This works much like a deletion or insertion, except that there's no string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
195 The tricky part is that the buffer we operate on comes from EXTENT.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
196 Most extent changes happen as a side effect of string insertion and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
197 deletion; this call is solely for Fdetach_extent() and Finsert_extent().
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
198 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
199 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
200 record_extent (Lisp_Object extent, int attached)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
201 {
167
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 70
diff changeset
202 Lisp_Object obj = Fextent_object (extent);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
203
167
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 70
diff changeset
204 if (BUFFERP (obj))
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 70
diff changeset
205 {
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 70
diff changeset
206 Lisp_Object token;
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 70
diff changeset
207 struct buffer *b = XBUFFER (obj);
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 70
diff changeset
208 if (!undo_prelude (b, 1))
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 70
diff changeset
209 return;
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 70
diff changeset
210 if (attached)
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 70
diff changeset
211 token = extent;
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 70
diff changeset
212 else
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 70
diff changeset
213 token = list3 (extent, Fextent_start_position (extent),
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 70
diff changeset
214 Fextent_end_position (extent));
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 70
diff changeset
215 b->undo_list = Fcons (token, b->undo_list);
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 70
diff changeset
216 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
217 else
167
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 70
diff changeset
218 return;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
219 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
220
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
221 #if 0 /* FSFmacs */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
222 /* Record a change in property PROP (whose old value was VAL)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
223 for LENGTH characters starting at position BEG in BUFFER. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
224
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
225 record_property_change (Bufpos beg, Charcount length,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
226 Lisp_Object prop, Lisp_Object value,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
227 Lisp_Object buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
228 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
229 Lisp_Object lbeg, lend, entry;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
230 struct buffer *b = XBUFFER (buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
231
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
232 if (!undo_prelude (b, 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
233 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
234
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
235 lbeg = make_int (beg);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
236 lend = make_int (beg + length);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
237 entry = Fcons (Qnil, Fcons (prop, Fcons (value, Fcons (lbeg, lend))));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
238 b->undo_list = Fcons (entry, b->undo_list);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
239 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
240 #endif /* FSFmacs */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
241
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
242
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
243 DEFUN ("undo-boundary", Fundo_boundary, 0, 0, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
244 Mark a boundary between units of undo.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
245 An undo command will stop at this point,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
246 but another undo command will undo to the previous boundary.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
247 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
248 ())
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
249 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
250 if (EQ (current_buffer->undo_list, Qt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
251 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
252 undo_boundary (current_buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
253 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
254 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
255
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
256 /* At garbage collection time, make an undo list shorter at the end,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
257 returning the truncated list.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
258 MINSIZE and MAXSIZE are the limits on size allowed, as described below.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
259 In practice, these are the values of undo-threshold and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
260 undo-high-threshold. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
261
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
262 Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
263 truncate_undo_list (Lisp_Object list, int minsize, int maxsize)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
264 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
265 Lisp_Object prev, next, last_boundary;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
266 int size_so_far = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
267
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
268 if (!(minsize > 0 || maxsize > 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
269 return list;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
270
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
271 prev = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
272 next = list;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
273 last_boundary = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
274
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
275 if (!CONSP (list))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
276 return (list);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
277
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
278 /* Always preserve at least the most recent undo record.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
279 If the first element is an undo boundary, skip past it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
280 if (CONSP (next)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
281 && NILP (XCAR (next)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
282 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
283 /* Add in the space occupied by this element and its chain link. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
284 size_so_far += sizeof (struct Lisp_Cons);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
285
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
286 /* Advance to next element. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
287 prev = next;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
288 next = XCDR (next);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
289 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
290 while (CONSP (next)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
291 && !NILP (XCAR (next)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
292 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
293 Lisp_Object elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
294 elt = XCAR (next);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
295
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
296 /* Add in the space occupied by this element and its chain link. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
297 size_so_far += sizeof (struct Lisp_Cons);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
298 if (CONSP (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
299 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
300 size_so_far += sizeof (struct Lisp_Cons);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
301 if (STRINGP (XCAR (elt)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
302 size_so_far += (sizeof (struct Lisp_String) - 1
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 0
diff changeset
303 + XSTRING_LENGTH (XCAR (elt)));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
304 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
305
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
306 /* Advance to next element. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
307 prev = next;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
308 next = XCDR (next);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
309 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
310 if (CONSP (next))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
311 last_boundary = prev;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
312
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
313 while (CONSP (next))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
314 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
315 Lisp_Object elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
316 elt = XCAR (next);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
317
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
318 /* When we get to a boundary, decide whether to truncate
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
319 either before or after it. The lower threshold, MINSIZE,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
320 tells us to truncate after it. If its size pushes past
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
321 the higher threshold MAXSIZE as well, we truncate before it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
322 if (NILP (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
323 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
324 if (size_so_far > maxsize && maxsize > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
325 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
326 last_boundary = prev;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
327 if (size_so_far > minsize && minsize > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
328 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
329 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
330
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
331 /* Add in the space occupied by this element and its chain link. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
332 size_so_far += sizeof (struct Lisp_Cons);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
333 if (CONSP (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
334 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
335 size_so_far += sizeof (struct Lisp_Cons);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
336 if (STRINGP (XCAR (elt)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
337 size_so_far += (sizeof (struct Lisp_String) - 1
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 0
diff changeset
338 + XSTRING_LENGTH (XCAR (elt)));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
339 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
340
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
341 /* Advance to next element. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
342 prev = next;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
343 next = XCDR (next);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
344 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
345
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
346 /* If we scanned the whole list, it is short enough; don't change it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
347 if (NILP (next))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
348 return list;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
349
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
350 /* Truncate at the boundary where we decided to truncate. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
351 if (!NILP (last_boundary))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
352 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
353 XCDR (last_boundary) = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
354 return list;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
355 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
356 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
357 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
358 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
359
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
360 DEFUN ("primitive-undo", Fprimitive_undo, 2, 2, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
361 Undo COUNT records from the front of the list LIST.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
362 Return what remains of the list.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
363 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
364 (count, list))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
365 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
366 struct gcpro gcpro1, gcpro2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
367 Lisp_Object next = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
368 /* This function can GC */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
369 int arg;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
370 int speccount = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
371
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
372 record_unwind_protect (restore_inside_undo, make_int (inside_undo));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
373 inside_undo = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
374
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
375 #if 0 /* This is a good feature, but would make undo-start
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
376 unable to do what is expected. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
377 Lisp_Object tem;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
378
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
379 /* If the head of the list is a boundary, it is the boundary
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
380 preceding this command. Get rid of it and don't count it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
381 tem = Fcar (list);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
382 if (NILP (tem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
383 list = Fcdr (list);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
384 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
385
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
386 CHECK_INT (count);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
387 arg = XINT (count);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
388 next = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
389 GCPRO2 (next, list);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
390
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
391 /* Don't let read-only properties interfere with undo. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
392 if (NILP (current_buffer->read_only))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
393 specbind (Qinhibit_read_only, Qt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
394
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
395 while (arg > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
396 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
397 while (1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
398 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
399 if (NILP (list))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
400 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
401 else if (!CONSP (list))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
402 goto rotten;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
403 next = XCAR (list);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
404 list = XCDR (list);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
405 /* Exit inner loop at undo boundary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
406 if (NILP (next))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
407 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
408 /* Handle an integer by setting point to that value. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
409 else if (INTP (next))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
410 BUF_SET_PT (current_buffer,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
411 bufpos_clip_to_bounds (BUF_BEGV (current_buffer),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
412 XINT (next),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
413 BUF_ZV (current_buffer)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
414 else if (CONSP (next))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
415 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
416 Lisp_Object car = XCAR (next);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
417 Lisp_Object cdr = XCDR (next);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
418
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
419 if (EQ (car, Qt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
420 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
421 /* Element (t high . low) records previous modtime. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
422 Lisp_Object high, low;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
423 int mod_time;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
424 if (!CONSP (cdr)) goto rotten;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
425 high = XCAR (cdr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
426 low = XCDR (cdr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
427 if (!INTP (high) || !INTP (low)) goto rotten;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
428 mod_time = (XINT (high) << 16) + XINT (low);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
429 /* If this records an obsolete save
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
430 (not matching the actual disk file)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
431 then don't mark unmodified. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
432 if (mod_time != current_buffer->modtime)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
433 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
434 #ifdef CLASH_DETECTION
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
435 Funlock_buffer ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
436 #endif /* CLASH_DETECTION */
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 217
diff changeset
437 /* may GC under ENERGIZE: */
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 217
diff changeset
438 Fset_buffer_modified_p (Qnil, Qnil);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
439 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
440 else if (EXTENTP (car))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
441 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
442 /* Element (extent start end) means that EXTENT was
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
443 detached, and we need to reattach it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
444 Lisp_Object extent_obj, start, end;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 167
diff changeset
445
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
446 extent_obj = car;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
447 start = Fcar (cdr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
448 end = Fcar (Fcdr (cdr));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
449
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
450 if (!INTP (start) || !INTP (end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
451 goto rotten;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
452 Fset_extent_endpoints (extent_obj, start, end,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
453 Fcurrent_buffer ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
454 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
455 #if 0 /* FSFmacs */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
456 else if (EQ (car, Qnil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
457 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
458 /* Element (nil prop val beg . end) is property change. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
459 Lisp_Object beg, end, prop, val;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
460
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
461 prop = Fcar (cdr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
462 cdr = Fcdr (cdr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
463 val = Fcar (cdr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
464 cdr = Fcdr (cdr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
465 beg = Fcar (cdr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
466 end = Fcdr (cdr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
467
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
468 Fput_text_property (beg, end, prop, val, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
469 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
470 #endif /* FSFmacs */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
471 else if (INTP (car) && INTP (cdr))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
472 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
473 /* Element (BEG . END) means range was inserted. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
474
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
475 if (XINT (car) < BUF_BEGV (current_buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
476 || XINT (cdr) > BUF_ZV (current_buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
477 error ("Changes to be undone are outside visible portion of buffer");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
478 /* Set point first thing, so that undoing this undo
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
479 does not send point back to where it is now. */
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 217
diff changeset
480 Fgoto_char (car, Qnil);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 217
diff changeset
481 Fdelete_region (car, cdr, Qnil);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
482 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
483 else if (STRINGP (car) && INTP (cdr))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
484 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
485 /* Element (STRING . POS) means STRING was deleted. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
486 Lisp_Object membuf = car;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
487 int pos = XINT (cdr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
488
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
489 if (pos < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
490 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
491 if (-pos < BUF_BEGV (current_buffer) || -pos > BUF_ZV (current_buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
492 error ("Changes to be undone are outside visible portion of buffer");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
493 BUF_SET_PT (current_buffer, -pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
494 Finsert (1, &membuf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
495 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
496 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
497 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
498 if (pos < BUF_BEGV (current_buffer) || pos > BUF_ZV (current_buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
499 error ("Changes to be undone are outside visible portion of buffer");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
500 BUF_SET_PT (current_buffer, pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
501
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
502 /* Insert before markers so that if the mark is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
503 currently on the boundary of this deletion, it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
504 ends up on the other side of the now-undeleted
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
505 text from point. Since undo doesn't even keep
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
506 track of the mark, this isn't really necessary,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
507 but it may lead to better behavior in certain
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
508 situations.
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 167
diff changeset
509
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
510 I'm doubtful that this is safe; you could mess
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
511 up the process-output mark in shell buffers, so
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
512 until I hear a compelling reason for this change,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
513 I'm leaving it out. -jwz
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
514 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
515 /* Finsert_before_markers (1, &membuf); */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
516 Finsert (1, &membuf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
517 BUF_SET_PT (current_buffer, pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
518 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
519 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
520 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
521 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
522 goto rotten;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
523 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
524 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
525 else if (EXTENTP (next))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
526 Fdetach_extent (next);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
527 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
528 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
529 rotten:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
530 signal_simple_continuable_error
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 223
diff changeset
531 ("Something rotten in the state of undo", next);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
532 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
533 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
534 arg--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
535 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
536
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
537 UNGCPRO;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
538 return unbind_to (speccount, list);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
539 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
540
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
541 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
542 syms_of_undo (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
543 {
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
544 DEFSUBR (Fprimitive_undo);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
545 DEFSUBR (Fundo_boundary);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
546 defsymbol (&Qinhibit_read_only, "inhibit-read-only");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
547 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
548
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
549 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
550 vars_of_undo (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
551 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
552 inside_undo = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
553 pending_boundary = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
554 staticpro (&pending_boundary);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
555 last_undo_buffer = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
556 staticpro (&last_undo_buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
557 }