annotate src/undo.c @ 105703:56a197ab757c

(comint-read-input-ring, comint-write-input-ring) (comint-substitute-in-file-name) (comint-dynamic-complete-as-filename) (comint-dynamic-simple-complete) (comint-dynamic-list-filename-completions) (comint-dynamic-list-completions) (comint-redirect-results-list-from-process): Minor simplifications.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 22 Oct 2009 03:24:31 +0000
parents 68dd71358159
children 21bdda3ded62
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.
75227
e90d04cd455a Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents: 68651
diff changeset
2 Copyright (C) 1990, 1993, 1994, 2000, 2001, 2002, 2003, 2004,
100951
e038c1a8307c Add 2009 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 98295
diff changeset
3 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5 This file is part of GNU Emacs.
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93663
diff changeset
7 GNU Emacs is free software: you can redistribute it and/or modify
14186
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 12649
diff changeset
8 it under the terms of the GNU General Public License as published by
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93663
diff changeset
9 the Free Software Foundation, either version 3 of the License, or
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93663
diff changeset
10 (at your option) any later version.
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11
14186
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 12649
diff changeset
12 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
13 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
14 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
15 GNU General Public License for more details.
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 12649
diff changeset
16
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 12649
diff changeset
17 You should have received a copy of the GNU General Public License
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93663
diff changeset
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
19
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
20
4696
1fc792473491 Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents: 3719
diff changeset
21 #include <config.h>
105669
68dd71358159 * alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101583
diff changeset
22 #include <setjmp.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"
67821
11268b0660c8 Depend on window.h.
Richard M. Stallman <rms@gnu.org>
parents: 67339
diff changeset
26 #include "window.h"
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
27
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
28 /* Limits controlling how much undo information to keep. */
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
29
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
30 EMACS_INT undo_limit;
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
31 EMACS_INT undo_strong_limit;
59069
27371673eba8 (Vundo_outer_limit): Replaces undo_outer_limit. Uses changed.
Richard M. Stallman <rms@gnu.org>
parents: 59048
diff changeset
32
27371673eba8 (Vundo_outer_limit): Replaces undo_outer_limit. Uses changed.
Richard M. Stallman <rms@gnu.org>
parents: 59048
diff changeset
33 Lisp_Object Vundo_outer_limit;
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
34
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
35 /* Function to call when undo_outer_limit is exceeded. */
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
36
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
37 Lisp_Object Vundo_outer_limit_function;
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
38
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
39 /* Last buffer for which undo information was recorded. */
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
40 /* BEWARE: This is not traced by the GC, so never dereference it! */
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
41 struct buffer *last_undo_buffer;
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
42
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
43 /* Position of point last time we inserted a boundary. */
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
44 struct buffer *last_boundary_buffer;
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
45 EMACS_INT last_boundary_position;
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
46
3696
aa9310f06c0f (syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents: 3687
diff changeset
47 Lisp_Object Qinhibit_read_only;
aa9310f06c0f (syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents: 3687
diff changeset
48
59832
ff1b86883ff8 (Qapply): New lisp var.
Kim F. Storm <storm@cua.dk>
parents: 59793
diff changeset
49 /* Marker for function call undo list elements. */
ff1b86883ff8 (Qapply): New lisp var.
Kim F. Storm <storm@cua.dk>
parents: 59793
diff changeset
50
ff1b86883ff8 (Qapply): New lisp var.
Kim F. Storm <storm@cua.dk>
parents: 59793
diff changeset
51 Lisp_Object Qapply;
ff1b86883ff8 (Qapply): New lisp var.
Kim F. Storm <storm@cua.dk>
parents: 59793
diff changeset
52
6254
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
53 /* 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
54 it also allocates the undo-boundary object
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
55 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
56 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
57 an undo-boundary. */
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
58 Lisp_Object pending_boundary;
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
59
87860
c250fe62d36e (undo_inhibit_record_point): New variable.
Martin Rudalics <rudalics@gmx.at>
parents: 79759
diff changeset
60 /* Nonzero means do not record point in record_point. */
c250fe62d36e (undo_inhibit_record_point): New variable.
Martin Rudalics <rudalics@gmx.at>
parents: 79759
diff changeset
61
c250fe62d36e (undo_inhibit_record_point): New variable.
Martin Rudalics <rudalics@gmx.at>
parents: 79759
diff changeset
62 int undo_inhibit_record_point;
c250fe62d36e (undo_inhibit_record_point): New variable.
Martin Rudalics <rudalics@gmx.at>
parents: 79759
diff changeset
63
44391
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
64 /* Record point as it was at beginning of this command (if necessary)
87860
c250fe62d36e (undo_inhibit_record_point): New variable.
Martin Rudalics <rudalics@gmx.at>
parents: 79759
diff changeset
65 and prepare the undo info for recording a change.
44391
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
66 PT is the position of point that will naturally occur as a result of the
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
67 undo record that will be added just after this command terminates. */
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
68
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
69 static void
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
70 record_point (pt)
48326
eb8f8ac018c9 (record_point):
Dave Love <fx@gnu.org>
parents: 46370
diff changeset
71 int pt;
44391
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
72 {
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
73 int at_boundary;
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
74
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
75 /* Don't record position of pt when undo_inhibit_record_point holds. */
87860
c250fe62d36e (undo_inhibit_record_point): New variable.
Martin Rudalics <rudalics@gmx.at>
parents: 79759
diff changeset
76 if (undo_inhibit_record_point)
c250fe62d36e (undo_inhibit_record_point): New variable.
Martin Rudalics <rudalics@gmx.at>
parents: 79759
diff changeset
77 return;
c250fe62d36e (undo_inhibit_record_point): New variable.
Martin Rudalics <rudalics@gmx.at>
parents: 79759
diff changeset
78
44391
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
79 /* Allocate a cons cell to be the undo boundary after this command. */
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
80 if (NILP (pending_boundary))
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
81 pending_boundary = Fcons (Qnil, Qnil);
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
82
98295
a7da9fedfcf9 (record_point): Don't call Fundo_boundary for first
Martin Rudalics <rudalics@gmx.at>
parents: 94963
diff changeset
83 if ((current_buffer != last_undo_buffer)
a7da9fedfcf9 (record_point): Don't call Fundo_boundary for first
Martin Rudalics <rudalics@gmx.at>
parents: 94963
diff changeset
84 /* Don't call Fundo_boundary for the first change. Otherwise we
a7da9fedfcf9 (record_point): Don't call Fundo_boundary for first
Martin Rudalics <rudalics@gmx.at>
parents: 94963
diff changeset
85 risk overwriting last_boundary_position in Fundo_boundary with
a7da9fedfcf9 (record_point): Don't call Fundo_boundary for first
Martin Rudalics <rudalics@gmx.at>
parents: 94963
diff changeset
86 PT of the current buffer and as a consequence not insert an
a7da9fedfcf9 (record_point): Don't call Fundo_boundary for first
Martin Rudalics <rudalics@gmx.at>
parents: 94963
diff changeset
87 undo boundary because last_boundary_position will equal pt in
a7da9fedfcf9 (record_point): Don't call Fundo_boundary for first
Martin Rudalics <rudalics@gmx.at>
parents: 94963
diff changeset
88 the test at the end of the present function (Bug#731). */
a7da9fedfcf9 (record_point): Don't call Fundo_boundary for first
Martin Rudalics <rudalics@gmx.at>
parents: 94963
diff changeset
89 && (MODIFF > SAVE_MODIFF))
44391
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
90 Fundo_boundary ();
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
91 last_undo_buffer = current_buffer;
44391
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
92
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
93 if (CONSP (current_buffer->undo_list))
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
94 {
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
95 /* Set AT_BOUNDARY to 1 only when we have nothing other than
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
96 marker adjustment before undo boundary. */
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
97
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
98 Lisp_Object tail = current_buffer->undo_list, elt;
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
99
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
100 while (1)
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
101 {
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
102 if (NILP (tail))
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
103 elt = Qnil;
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
104 else
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
105 elt = XCAR (tail);
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
106 if (NILP (elt) || ! (CONSP (elt) && MARKERP (XCAR (elt))))
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
107 break;
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
108 tail = XCDR (tail);
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
109 }
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
110 at_boundary = NILP (elt);
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
111 }
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
112 else
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
113 at_boundary = 1;
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
114
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
115 if (MODIFF <= SAVE_MODIFF)
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
116 record_first_change ();
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
117
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48326
diff changeset
118 /* If we are just after an undo boundary, and
44391
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
119 point wasn't at start of deleted range, record where it was. */
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
120 if (at_boundary
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
121 && current_buffer == last_boundary_buffer
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
122 && last_boundary_position != pt)
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
123 current_buffer->undo_list
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
124 = Fcons (make_number (last_boundary_position), current_buffer->undo_list);
44391
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
125 }
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
126
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
127 /* Record an insertion that just happened or is about to happen,
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
128 for LENGTH characters at position BEG.
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
129 (It is possible to record an insertion before or after the fact
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
130 because we don't need to record the contents.) */
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
131
20372
259194f66d40 (record_change, record_first_change,
Kenichi Handa <handa@m17n.org>
parents: 17447
diff changeset
132 void
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
133 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
134 int beg, length;
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
135 {
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
136 Lisp_Object lbeg, lend;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
137
2194
886a69457557 (record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents: 1968
diff changeset
138 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
139 return;
886a69457557 (record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents: 1968
diff changeset
140
44391
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
141 record_point (beg);
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
142
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
143 /* If this is following another insertion and consecutive with it
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
144 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
145 if (CONSP (current_buffer->undo_list))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
146 {
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
147 Lisp_Object elt;
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
148 elt = XCAR (current_buffer->undo_list);
9108
c0287cefc0f8 (record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents: 7671
diff changeset
149 if (CONSP (elt)
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
150 && INTEGERP (XCAR (elt))
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
151 && INTEGERP (XCDR (elt))
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
152 && XINT (XCDR (elt)) == beg)
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
153 {
39973
579177964efa Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents: 39798
diff changeset
154 XSETCDR (elt, make_number (beg + length));
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
155 return;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
156 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
157 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
158
12088
f0c9d02fb6e4 (record_insert): Change args to be ints, not Lisp_Objects.
Karl Heuer <kwzh@gnu.org>
parents: 10300
diff changeset
159 XSETFASTINT (lbeg, beg);
f0c9d02fb6e4 (record_insert): Change args to be ints, not Lisp_Objects.
Karl Heuer <kwzh@gnu.org>
parents: 10300
diff changeset
160 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
161 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
162 current_buffer->undo_list);
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
163 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
164
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
165 /* 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
166 of the characters in STRING, at location BEG. */
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
167
20373
b6c215dec8c8 (record_delete, record_marker_adjustment): Declare them as void.
Kenichi Handa <handa@m17n.org>
parents: 20372
diff changeset
168 void
21237
c5a8ee5b9b39 (record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents: 20373
diff changeset
169 record_delete (beg, string)
c5a8ee5b9b39 (record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents: 20373
diff changeset
170 int beg;
c5a8ee5b9b39 (record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents: 20373
diff changeset
171 Lisp_Object string;
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
172 {
21237
c5a8ee5b9b39 (record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents: 20373
diff changeset
173 Lisp_Object sbeg;
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
174
2194
886a69457557 (record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents: 1968
diff changeset
175 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
176 return;
886a69457557 (record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents: 1968
diff changeset
177
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46285
diff changeset
178 if (PT == beg + SCHARS (string))
21272
b1bc69132f55 (record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents: 21237
diff changeset
179 {
44391
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
180 XSETINT (sbeg, -beg);
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
181 record_point (PT);
21272
b1bc69132f55 (record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents: 21237
diff changeset
182 }
b1bc69132f55 (record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents: 21237
diff changeset
183 else
44391
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
184 {
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
185 XSETFASTINT (sbeg, beg);
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
186 record_point (beg);
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
187 }
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
188
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
189 current_buffer->undo_list
21237
c5a8ee5b9b39 (record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents: 20373
diff changeset
190 = Fcons (Fcons (string, sbeg), current_buffer->undo_list);
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
191 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
192
14480
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
193 /* 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
194 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
195 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
196 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
197
20373
b6c215dec8c8 (record_delete, record_marker_adjustment): Declare them as void.
Kenichi Handa <handa@m17n.org>
parents: 20372
diff changeset
198 void
14480
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
199 record_marker_adjustment (marker, adjustment)
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
200 Lisp_Object marker;
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
201 int adjustment;
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
202 {
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
203 if (EQ (current_buffer->undo_list, Qt))
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
204 return;
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
205
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
206 /* 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
207 if (NILP (pending_boundary))
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
208 pending_boundary = Fcons (Qnil, Qnil);
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
209
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
210 if (current_buffer != last_undo_buffer)
14480
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
211 Fundo_boundary ();
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
212 last_undo_buffer = current_buffer;
14480
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
213
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
214 current_buffer->undo_list
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
215 = Fcons (Fcons (marker, make_number (adjustment)),
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
216 current_buffer->undo_list);
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
217 }
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
218
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
219 /* Record that a replacement is about to take place,
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
220 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
221 The replacement must not change the number of characters. */
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
222
20373
b6c215dec8c8 (record_delete, record_marker_adjustment): Declare them as void.
Kenichi Handa <handa@m17n.org>
parents: 20372
diff changeset
223 void
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
224 record_change (beg, length)
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
225 int beg, length;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
226 {
21237
c5a8ee5b9b39 (record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents: 20373
diff changeset
227 record_delete (beg, make_buffer_string (beg, beg + length, 1));
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
228 record_insert (beg, length);
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
229 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
230
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
231 /* Record that an unmodified buffer is about to be changed.
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
232 Record the file modification date so that when undoing this entry
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
233 we can tell whether it is obsolete because the file was saved again. */
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
234
20372
259194f66d40 (record_change, record_first_change,
Kenichi Handa <handa@m17n.org>
parents: 17447
diff changeset
235 void
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
236 record_first_change ()
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
237 {
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
238 Lisp_Object high, low;
10300
323ad02feb1e (Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents: 9322
diff changeset
239 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
240
099857a46901 (record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
241 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
242 return;
099857a46901 (record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
243
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
244 if (current_buffer != last_undo_buffer)
5762
099857a46901 (record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
245 Fundo_boundary ();
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
246 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
247
10300
323ad02feb1e (Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents: 9322
diff changeset
248 if (base_buffer->base_buffer)
323ad02feb1e (Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents: 9322
diff changeset
249 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
250
323ad02feb1e (Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents: 9322
diff changeset
251 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
252 XSETFASTINT (low, base_buffer->modtime & 0xffff);
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
253 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
254 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
255
1968
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
256 /* 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
257 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
258
20372
259194f66d40 (record_change, record_first_change,
Kenichi Handa <handa@m17n.org>
parents: 17447
diff changeset
259 void
1968
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
260 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
261 int beg, length;
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
262 Lisp_Object prop, value, buffer;
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
263 {
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
264 Lisp_Object lbeg, lend, entry;
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
265 struct buffer *obuf = current_buffer, *buf = XBUFFER (buffer);
1968
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
266 int boundary = 0;
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
267
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
268 if (EQ (buf->undo_list, Qt))
2194
886a69457557 (record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents: 1968
diff changeset
269 return;
886a69457557 (record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents: 1968
diff changeset
270
6254
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
271 /* 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
272 if (NILP (pending_boundary))
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
273 pending_boundary = Fcons (Qnil, Qnil);
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
274
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
275 if (buf != last_undo_buffer)
1968
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
276 boundary = 1;
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
277 last_undo_buffer = buf;
1968
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
278
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
279 /* Switch temporarily to the buffer that was changed. */
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
280 current_buffer = buf;
1968
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
281
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
282 if (boundary)
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
283 Fundo_boundary ();
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
284
10300
323ad02feb1e (Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents: 9322
diff changeset
285 if (MODIFF <= SAVE_MODIFF)
1968
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
286 record_first_change ();
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
287
9281
05b2bd5d5559 (record_insert, record_delete, record_first_change, record_property_change):
Karl Heuer <kwzh@gnu.org>
parents: 9108
diff changeset
288 XSETINT (lbeg, beg);
05b2bd5d5559 (record_insert, record_delete, record_first_change, record_property_change):
Karl Heuer <kwzh@gnu.org>
parents: 9108
diff changeset
289 XSETINT (lend, beg + length);
1968
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
290 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
291 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
292
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
293 current_buffer = obuf;
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
294 }
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
295
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
296 DEFUN ("undo-boundary", Fundo_boundary, Sundo_boundary, 0, 0, 0,
40123
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
297 doc: /* Mark a boundary between units of undo.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
298 An undo command will stop at this point,
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
299 but another undo command will undo to the previous boundary. */)
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
300 ()
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
301 {
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
302 Lisp_Object tem;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
303 if (EQ (current_buffer->undo_list, Qt))
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
304 return Qnil;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
305 tem = Fcar (current_buffer->undo_list);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 241
diff changeset
306 if (!NILP (tem))
6254
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
307 {
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
308 /* 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
309 if (!NILP (pending_boundary))
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
310 {
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
311 /* 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
312 use that one. */
39973
579177964efa Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents: 39798
diff changeset
313 XSETCDR (pending_boundary, current_buffer->undo_list);
6254
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
314 current_buffer->undo_list = pending_boundary;
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
315 pending_boundary = Qnil;
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
316 }
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
317 else
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
318 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
319 }
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
320 last_boundary_position = PT;
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
321 last_boundary_buffer = current_buffer;
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
322 return Qnil;
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 /* At garbage collection time, make an undo list shorter at the end,
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
326 returning the truncated list. How this is done depends on the
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
327 variables undo-limit, undo-strong-limit and undo-outer-limit.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
328 In some cases this works by calling undo-outer-limit-function. */
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
329
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
330 void
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
331 truncate_undo_list (b)
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
332 struct buffer *b;
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
333 {
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
334 Lisp_Object list;
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
335 Lisp_Object prev, next, last_boundary;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
336 int size_so_far = 0;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
337
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
338 /* Make sure that calling undo-outer-limit-function
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
339 won't cause another GC. */
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
340 int count = inhibit_garbage_collection ();
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
341
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
342 /* Make the buffer current to get its local values of variables such
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
343 as undo_limit. Also so that Vundo_outer_limit_function can
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
344 tell which buffer to operate on. */
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
345 record_unwind_protect (set_buffer_if_live, Fcurrent_buffer ());
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
346 set_buffer_internal (b);
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
347
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
348 list = b->undo_list;
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
349
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
350 prev = Qnil;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
351 next = list;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
352 last_boundary = Qnil;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
353
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
354 /* If the first element is an undo boundary, skip past it. */
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
355 if (CONSP (next) && NILP (XCAR (next)))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
356 {
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
357 /* Add in the space occupied by this element and its chain link. */
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
358 size_so_far += sizeof (struct Lisp_Cons);
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;
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
362 next = XCDR (next);
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
363 }
55839
9e7829a684df (truncate_undo_list): New arg LIMITSIZE.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
364
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
365 /* Always preserve at least the most recent undo record
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
366 unless it is really horribly big.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
367
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
368 Skip, skip, skip the undo, skip, skip, skip the undo,
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
369 Skip, skip, skip the undo, skip to the undo bound'ry. */
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
370
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
371 while (CONSP (next) && ! NILP (XCAR (next)))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
372 {
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
373 Lisp_Object elt;
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
374 elt = XCAR (next);
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
375
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
376 /* Add in the space occupied by this element and its chain link. */
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
377 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
378 if (CONSP (elt))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
379 {
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
380 size_so_far += sizeof (struct Lisp_Cons);
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
381 if (STRINGP (XCAR (elt)))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
382 size_so_far += (sizeof (struct Lisp_String) - 1
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46285
diff changeset
383 + SCHARS (XCAR (elt)));
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
384 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
385
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
386 /* Advance to next element. */
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
387 prev = next;
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
388 next = XCDR (next);
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
389 }
55839
9e7829a684df (truncate_undo_list): New arg LIMITSIZE.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
390
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
391 /* If by the first boundary we have already passed undo_outer_limit,
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
392 we're heading for memory full, so offer to clear out the list. */
59069
27371673eba8 (Vundo_outer_limit): Replaces undo_outer_limit. Uses changed.
Richard M. Stallman <rms@gnu.org>
parents: 59048
diff changeset
393 if (INTEGERP (Vundo_outer_limit)
27371673eba8 (Vundo_outer_limit): Replaces undo_outer_limit. Uses changed.
Richard M. Stallman <rms@gnu.org>
parents: 59048
diff changeset
394 && size_so_far > XINT (Vundo_outer_limit)
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
395 && !NILP (Vundo_outer_limit_function))
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
396 {
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
397 Lisp_Object tem;
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
398 struct buffer *temp = last_undo_buffer;
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
399
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
400 /* Normally the function this calls is undo-outer-limit-truncate. */
67339
7a9d49053af3 (truncate_undo_list): Avoid dangerous side effects in NILP argument.
Ken Raeburn <raeburn@raeburn.org>
parents: 64770
diff changeset
401 tem = call1 (Vundo_outer_limit_function, make_number (size_so_far));
7a9d49053af3 (truncate_undo_list): Avoid dangerous side effects in NILP argument.
Ken Raeburn <raeburn@raeburn.org>
parents: 64770
diff changeset
402 if (! NILP (tem))
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
403 {
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
404 /* The function is responsible for making
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
405 any desired changes in buffer-undo-list. */
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
406 unbind_to (count, Qnil);
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
407 return;
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
408 }
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
409 /* That function probably used the minibuffer, and if so, that
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
410 changed last_undo_buffer. Change it back so that we don't
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
411 force next change to make an undo boundary here. */
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
412 last_undo_buffer = temp;
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
413 }
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
414
9108
c0287cefc0f8 (record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents: 7671
diff changeset
415 if (CONSP (next))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
416 last_boundary = prev;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
417
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
418 /* Keep additional undo data, if it fits in the limits. */
9108
c0287cefc0f8 (record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents: 7671
diff changeset
419 while (CONSP (next))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
420 {
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
421 Lisp_Object elt;
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
422 elt = XCAR (next);
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
423
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
424 /* When we get to a boundary, decide whether to truncate
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
425 either before or after it. The lower threshold, undo_limit,
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
426 tells us to truncate after it. If its size pushes past
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
427 the higher threshold undo_strong_limit, we truncate before it. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 241
diff changeset
428 if (NILP (elt))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
429 {
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
430 if (size_so_far > undo_strong_limit)
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
431 break;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
432 last_boundary = prev;
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
433 if (size_so_far > undo_limit)
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
434 break;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
435 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
436
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
437 /* Add in the space occupied by this element and its chain link. */
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
438 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
439 if (CONSP (elt))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
440 {
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
441 size_so_far += sizeof (struct Lisp_Cons);
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
442 if (STRINGP (XCAR (elt)))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
443 size_so_far += (sizeof (struct Lisp_String) - 1
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46285
diff changeset
444 + SCHARS (XCAR (elt)));
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
445 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
446
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
447 /* Advance to next element. */
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
448 prev = next;
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
449 next = XCDR (next);
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
450 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
451
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
452 /* 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
453 if (NILP (next))
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
454 ;
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
455 /* Truncate at the boundary where we decided to truncate. */
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
456 else if (!NILP (last_boundary))
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
457 XSETCDR (last_boundary, Qnil);
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
458 /* There's nothing we decided to keep, so clear it out. */
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
459 else
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
460 b->undo_list = Qnil;
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
461
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
462 unbind_to (count, Qnil);
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
463 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
464
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
465 DEFUN ("primitive-undo", Fprimitive_undo, Sprimitive_undo, 2, 2, 0,
40123
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
466 doc: /* Undo N records from the front of the list LIST.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
467 Return what remains of the list. */)
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
468 (n, list)
3719
695181e4bc20 (Fprimitive_undo): Rename arg to N to avoid conflict.
Richard M. Stallman <rms@gnu.org>
parents: 3696
diff changeset
469 Lisp_Object n, list;
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
470 {
7671
31d444fcae24 (Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents: 7395
diff changeset
471 struct gcpro gcpro1, gcpro2;
31d444fcae24 (Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents: 7395
diff changeset
472 Lisp_Object next;
46285
3f111801efb4 Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 44391
diff changeset
473 int count = SPECPDL_INDEX ();
7671
31d444fcae24 (Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents: 7395
diff changeset
474 register int arg;
59970
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
475 Lisp_Object oldlist;
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
476 int did_apply = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48326
diff changeset
477
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
478 #if 0 /* This is a good feature, but would make undo-start
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
479 unable to do what is expected. */
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
480 Lisp_Object tem;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
481
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
482 /* If the head of the list is a boundary, it is the boundary
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
483 preceding this command. Get rid of it and don't count it. */
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
484 tem = Fcar (list);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 241
diff changeset
485 if (NILP (tem))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
486 list = Fcdr (list);
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
487 #endif
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
488
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40123
diff changeset
489 CHECK_NUMBER (n);
7671
31d444fcae24 (Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents: 7395
diff changeset
490 arg = XINT (n);
31d444fcae24 (Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents: 7395
diff changeset
491 next = Qnil;
31d444fcae24 (Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents: 7395
diff changeset
492 GCPRO2 (next, list);
59970
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
493 /* I don't think we need to gcpro oldlist, as we use it only
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
494 to check for EQ. ++kfs */
7671
31d444fcae24 (Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents: 7395
diff changeset
495
37527
d585b711c8d2 (Fprimitive_undo): In a writable buffer, enable undoing
Gerd Moellmann <gerd@gnu.org>
parents: 34965
diff changeset
496 /* In a writable buffer, enable undoing read-only text that is so
d585b711c8d2 (Fprimitive_undo): In a writable buffer, enable undoing
Gerd Moellmann <gerd@gnu.org>
parents: 34965
diff changeset
497 because of text properties. */
d585b711c8d2 (Fprimitive_undo): In a writable buffer, enable undoing
Gerd Moellmann <gerd@gnu.org>
parents: 34965
diff changeset
498 if (NILP (current_buffer->read_only))
3696
aa9310f06c0f (syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents: 3687
diff changeset
499 specbind (Qinhibit_read_only, Qt);
aa9310f06c0f (syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents: 3687
diff changeset
500
34794
12ca043196d7 (Fprimitive_undo): Bind `inhibit-point-motion-hooks' to t.
Gerd Moellmann <gerd@gnu.org>
parents: 34169
diff changeset
501 /* Don't let `intangible' properties interfere with undo. */
12ca043196d7 (Fprimitive_undo): Bind `inhibit-point-motion-hooks' to t.
Gerd Moellmann <gerd@gnu.org>
parents: 34169
diff changeset
502 specbind (Qinhibit_point_motion_hooks, Qt);
12ca043196d7 (Fprimitive_undo): Bind `inhibit-point-motion-hooks' to t.
Gerd Moellmann <gerd@gnu.org>
parents: 34169
diff changeset
503
59970
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
504 oldlist = current_buffer->undo_list;
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
505
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
506 while (arg > 0)
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
507 {
39798
d54a90934144 (Fprimitive_undo): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37527
diff changeset
508 while (CONSP (list))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
509 {
39798
d54a90934144 (Fprimitive_undo): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37527
diff changeset
510 next = XCAR (list);
d54a90934144 (Fprimitive_undo): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37527
diff changeset
511 list = XCDR (list);
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
512 /* Exit inner loop at undo boundary. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 241
diff changeset
513 if (NILP (next))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
514 break;
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
515 /* 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
516 if (INTEGERP (next))
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
517 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
518 else if (CONSP (next))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
519 {
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
520 Lisp_Object car, cdr;
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
521
39798
d54a90934144 (Fprimitive_undo): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37527
diff changeset
522 car = XCAR (next);
d54a90934144 (Fprimitive_undo): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37527
diff changeset
523 cdr = XCDR (next);
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
524 if (EQ (car, Qt))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
525 {
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
526 /* 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
527 Lisp_Object high, low;
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
528 int mod_time;
10300
323ad02feb1e (Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents: 9322
diff changeset
529 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
530
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
531 high = Fcar (cdr);
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
532 low = Fcdr (cdr);
3687
54381151027d (record_delete): Always use XFASTINT on sbeg.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
533 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
534
323ad02feb1e (Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents: 9322
diff changeset
535 if (current_buffer->base_buffer)
323ad02feb1e (Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents: 9322
diff changeset
536 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
537
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
538 /* If this records an obsolete save
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
539 (not matching the actual disk file)
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
540 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
541 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
542 continue;
1598
3e9dadf2d13c * undo.c (Fprimitive_undo): Remove whitespace in front of #ifdef
Jim Blandy <jimb@redhat.com>
parents: 1524
diff changeset
543 #ifdef CLASH_DETECTION
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
544 Funlock_buffer ();
1598
3e9dadf2d13c * undo.c (Fprimitive_undo): Remove whitespace in front of #ifdef
Jim Blandy <jimb@redhat.com>
parents: 1524
diff changeset
545 #endif /* CLASH_DETECTION */
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
546 Fset_buffer_modified_p (Qnil);
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
547 }
3687
54381151027d (record_delete): Always use XFASTINT on sbeg.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
548 else if (EQ (car, Qnil))
1968
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
549 {
59777
06bae5eee9dc (Fprimitive_undo): Handle (FUNNAME . ARGS) by calling FUNNAME.
Richard M. Stallman <rms@gnu.org>
parents: 59069
diff changeset
550 /* 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
551 Lisp_Object beg, end, prop, val;
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
552
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
553 prop = Fcar (cdr);
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
554 cdr = Fcdr (cdr);
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
555 val = Fcar (cdr);
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
556 cdr = Fcdr (cdr);
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
557 beg = Fcar (cdr);
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
558 end = Fcdr (cdr);
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
559
76800
3f97b6926170 (Fprimitive_undo): Give clearer error message when trying to change
Chong Yidong <cyd@stupidchicken.com>
parents: 75227
diff changeset
560 if (XINT (beg) < BEGV || XINT (end) > ZV)
3f97b6926170 (Fprimitive_undo): Give clearer error message when trying to change
Chong Yidong <cyd@stupidchicken.com>
parents: 75227
diff changeset
561 error ("Changes to be undone are outside visible portion of buffer");
1968
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
562 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
563 }
9108
c0287cefc0f8 (record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents: 7671
diff changeset
564 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
565 {
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
566 /* 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
567
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
568 if (XINT (car) < BEGV
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
569 || XINT (cdr) > ZV)
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
570 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
571 /* 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
572 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
573 Fgoto_char (car);
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
574 Fdelete_region (car, cdr);
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
575 }
59832
ff1b86883ff8 (Qapply): New lisp var.
Kim F. Storm <storm@cua.dk>
parents: 59793
diff changeset
576 else if (EQ (car, Qapply))
59777
06bae5eee9dc (Fprimitive_undo): Handle (FUNNAME . ARGS) by calling FUNNAME.
Richard M. Stallman <rms@gnu.org>
parents: 59069
diff changeset
577 {
59992
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
578 /* Element (apply FUN . ARGS) means call FUN to undo. */
60000
bbd61dfcbd2c (Fprimitive_undo): Check that undo function does not switch buffer.
Kim F. Storm <storm@cua.dk>
parents: 59992
diff changeset
579 struct buffer *save_buffer = current_buffer;
bbd61dfcbd2c (Fprimitive_undo): Check that undo function does not switch buffer.
Kim F. Storm <storm@cua.dk>
parents: 59992
diff changeset
580
59832
ff1b86883ff8 (Qapply): New lisp var.
Kim F. Storm <storm@cua.dk>
parents: 59793
diff changeset
581 car = Fcar (cdr);
59992
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
582 cdr = Fcdr (cdr);
59832
ff1b86883ff8 (Qapply): New lisp var.
Kim F. Storm <storm@cua.dk>
parents: 59793
diff changeset
583 if (INTEGERP (car))
ff1b86883ff8 (Qapply): New lisp var.
Kim F. Storm <storm@cua.dk>
parents: 59793
diff changeset
584 {
59992
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
585 /* Long format: (apply DELTA START END FUN . ARGS). */
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
586 Lisp_Object delta = car;
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
587 Lisp_Object start = Fcar (cdr);
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
588 Lisp_Object end = Fcar (Fcdr (cdr));
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
589 Lisp_Object start_mark = Fcopy_marker (start, Qnil);
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
590 Lisp_Object end_mark = Fcopy_marker (end, Qt);
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
591
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
592 cdr = Fcdr (Fcdr (cdr));
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
593 apply1 (Fcar (cdr), Fcdr (cdr));
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
594
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
595 /* Check that the function did what the entry said it
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
596 would do. */
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
597 if (!EQ (start, Fmarker_position (start_mark))
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
598 || (XINT (delta) + XINT (end)
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
599 != marker_position (end_mark)))
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
600 error ("Changes to be undone by function different than announced");
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
601 Fset_marker (start_mark, Qnil, Qnil);
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
602 Fset_marker (end_mark, Qnil, Qnil);
59832
ff1b86883ff8 (Qapply): New lisp var.
Kim F. Storm <storm@cua.dk>
parents: 59793
diff changeset
603 }
59992
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
604 else
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
605 apply1 (car, cdr);
60000
bbd61dfcbd2c (Fprimitive_undo): Check that undo function does not switch buffer.
Kim F. Storm <storm@cua.dk>
parents: 59992
diff changeset
606
bbd61dfcbd2c (Fprimitive_undo): Check that undo function does not switch buffer.
Kim F. Storm <storm@cua.dk>
parents: 59992
diff changeset
607 if (save_buffer != current_buffer)
bbd61dfcbd2c (Fprimitive_undo): Check that undo function does not switch buffer.
Kim F. Storm <storm@cua.dk>
parents: 59992
diff changeset
608 error ("Undo function switched buffer");
59970
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
609 did_apply = 1;
59777
06bae5eee9dc (Fprimitive_undo): Handle (FUNNAME . ARGS) by calling FUNNAME.
Richard M. Stallman <rms@gnu.org>
parents: 59069
diff changeset
610 }
9108
c0287cefc0f8 (record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents: 7671
diff changeset
611 else if (STRINGP (car) && INTEGERP (cdr))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
612 {
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
613 /* 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
614 Lisp_Object membuf;
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
615 int pos = XINT (cdr);
544
054dfe2f6327 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
616
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
617 membuf = car;
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
618 if (pos < 0)
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
619 {
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
620 if (-pos < BEGV || -pos > ZV)
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
621 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
622 SET_PT (-pos);
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
623 Finsert (1, &membuf);
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
624 }
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
625 else
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
626 {
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
627 if (pos < BEGV || pos > ZV)
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
628 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
629 SET_PT (pos);
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
630
17447
dc2cb454b330 (Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents: 16039
diff changeset
631 /* Now that we record marker adjustments
dc2cb454b330 (Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents: 16039
diff changeset
632 (caused by deletion) for undo,
dc2cb454b330 (Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents: 16039
diff changeset
633 we should always insert after markers,
dc2cb454b330 (Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents: 16039
diff changeset
634 so that undoing the marker adjustments
dc2cb454b330 (Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents: 16039
diff changeset
635 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
636 Finsert (1, &membuf);
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
637 SET_PT (pos);
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
638 }
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
639 }
14480
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
640 else if (MARKERP (car) && INTEGERP (cdr))
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
641 {
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
642 /* (MARKER . INTEGER) means a marker MARKER
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
643 was adjusted by INTEGER. */
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
644 if (XMARKER (car)->buffer)
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
645 Fset_marker (car,
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
646 make_number (marker_position (car) - XINT (cdr)),
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
647 Fmarker_buffer (car));
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
648 }
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
649 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
650 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
651 arg--;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
652 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
653
59970
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
654
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
655 /* Make sure an apply entry produces at least one undo entry,
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
656 so the test in `undo' for continuing an undo series
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
657 will work right. */
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
658 if (did_apply
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
659 && EQ (oldlist, current_buffer->undo_list))
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
660 current_buffer->undo_list
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
661 = Fcons (list3 (Qapply, Qcdr, Qnil), current_buffer->undo_list);
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
662
7671
31d444fcae24 (Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents: 7395
diff changeset
663 UNGCPRO;
3696
aa9310f06c0f (syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents: 3687
diff changeset
664 return unbind_to (count, list);
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
665 }
59777
06bae5eee9dc (Fprimitive_undo): Handle (FUNNAME . ARGS) by calling FUNNAME.
Richard M. Stallman <rms@gnu.org>
parents: 59069
diff changeset
666
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21272
diff changeset
667 void
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
668 syms_of_undo ()
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
669 {
3696
aa9310f06c0f (syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents: 3687
diff changeset
670 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
671 staticpro (&Qinhibit_read_only);
aa9310f06c0f (syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents: 3687
diff changeset
672
59832
ff1b86883ff8 (Qapply): New lisp var.
Kim F. Storm <storm@cua.dk>
parents: 59793
diff changeset
673 Qapply = intern ("apply");
ff1b86883ff8 (Qapply): New lisp var.
Kim F. Storm <storm@cua.dk>
parents: 59793
diff changeset
674 staticpro (&Qapply);
ff1b86883ff8 (Qapply): New lisp var.
Kim F. Storm <storm@cua.dk>
parents: 59793
diff changeset
675
6254
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
676 pending_boundary = Qnil;
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
677 staticpro (&pending_boundary);
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
678
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
679 last_undo_buffer = NULL;
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
680 last_boundary_buffer = NULL;
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
681
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
682 defsubr (&Sprimitive_undo);
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
683 defsubr (&Sundo_boundary);
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
684
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
685 DEFVAR_INT ("undo-limit", &undo_limit,
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
686 doc: /* Keep no more undo information once it exceeds this size.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
687 This limit is applied when garbage collection happens.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
688 When a previous command increases the total undo list size past this
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
689 value, the earlier commands that came before it are forgotten.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
690
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
691 The size is counted as the number of bytes occupied,
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
692 which includes both saved text and other data. */);
101583
c2c9245e7699 (undo_limit, undo_strong_limit, Vundo_outer_limit): Quadruple undo
Chong Yidong <cyd@stupidchicken.com>
parents: 100951
diff changeset
693 undo_limit = 80000;
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
694
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
695 DEFVAR_INT ("undo-strong-limit", &undo_strong_limit,
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
696 doc: /* Don't keep more than this much size of undo information.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
697 This limit is applied when garbage collection happens.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
698 When a previous command increases the total undo list size past this
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
699 value, that command and the earlier commands that came before it are forgotten.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
700 However, the most recent buffer-modifying command's undo info
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
701 is never discarded for this reason.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
702
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
703 The size is counted as the number of bytes occupied,
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
704 which includes both saved text and other data. */);
101583
c2c9245e7699 (undo_limit, undo_strong_limit, Vundo_outer_limit): Quadruple undo
Chong Yidong <cyd@stupidchicken.com>
parents: 100951
diff changeset
705 undo_strong_limit = 120000;
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
706
59069
27371673eba8 (Vundo_outer_limit): Replaces undo_outer_limit. Uses changed.
Richard M. Stallman <rms@gnu.org>
parents: 59048
diff changeset
707 DEFVAR_LISP ("undo-outer-limit", &Vundo_outer_limit,
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
708 doc: /* Outer limit on size of undo information for one command.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
709 At garbage collection time, if the current command has produced
59791
fc2f566fb0fd (syms_of_undo) <undo-outer-limit>: Doc update.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59777
diff changeset
710 more than this much undo information, it discards the info and displays
fc2f566fb0fd (syms_of_undo) <undo-outer-limit>: Doc update.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59777
diff changeset
711 a warning. This is a last-ditch limit to prevent memory overflow.
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
712
59791
fc2f566fb0fd (syms_of_undo) <undo-outer-limit>: Doc update.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59777
diff changeset
713 The size is counted as the number of bytes occupied, which includes
fc2f566fb0fd (syms_of_undo) <undo-outer-limit>: Doc update.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59777
diff changeset
714 both saved text and other data. A value of nil means no limit. In
fc2f566fb0fd (syms_of_undo) <undo-outer-limit>: Doc update.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59777
diff changeset
715 this case, accumulating one huge undo entry could make Emacs crash as
fc2f566fb0fd (syms_of_undo) <undo-outer-limit>: Doc update.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59777
diff changeset
716 a result of memory overflow.
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
717
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
718 In fact, this calls the function which is the value of
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
719 `undo-outer-limit-function' with one argument, the size.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
720 The text above describes the behavior of the function
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
721 that variable usually specifies. */);
101583
c2c9245e7699 (undo_limit, undo_strong_limit, Vundo_outer_limit): Quadruple undo
Chong Yidong <cyd@stupidchicken.com>
parents: 100951
diff changeset
722 Vundo_outer_limit = make_number (12000000);
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
723
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
724 DEFVAR_LISP ("undo-outer-limit-function", &Vundo_outer_limit_function,
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
725 doc: /* Function to call when an undo list exceeds `undo-outer-limit'.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
726 This function is called with one argument, the current undo list size
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
727 for the most recent command (since the last undo boundary).
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
728 If the function returns t, that means truncation has been fully handled.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
729 If it returns nil, the other forms of truncation are done.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
730
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
731 Garbage collection is inhibited around the call to this function,
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
732 so it must make sure not to do a lot of consing. */);
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
733 Vundo_outer_limit_function = Qnil;
87860
c250fe62d36e (undo_inhibit_record_point): New variable.
Martin Rudalics <rudalics@gmx.at>
parents: 79759
diff changeset
734
c250fe62d36e (undo_inhibit_record_point): New variable.
Martin Rudalics <rudalics@gmx.at>
parents: 79759
diff changeset
735 DEFVAR_BOOL ("undo-inhibit-record-point", &undo_inhibit_record_point,
c250fe62d36e (undo_inhibit_record_point): New variable.
Martin Rudalics <rudalics@gmx.at>
parents: 79759
diff changeset
736 doc: /* Non-nil means do not record `point' in `buffer-undo-list'. */);
c250fe62d36e (undo_inhibit_record_point): New variable.
Martin Rudalics <rudalics@gmx.at>
parents: 79759
diff changeset
737 undo_inhibit_record_point = 0;
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
738 }
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
739
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
740 /* arch-tag: d546ee01-4aed-4ffb-bb8b-eefaae50d38a
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
741 (do not change this comment) */