Mercurial > hg > xemacs-beta
annotate src/undo.c @ 2367:ecf1ebac70d8
[xemacs-hg @ 2004-11-04 23:05:23 by ben]
commit mega-patch
configure.in: Turn off -Winline and -Wchar-subscripts.
Use the right set of cflags when compiling modules.
Rewrite ldap configuration to separate the inclusion of lber
(needed in recent Cygwin) from the basic checks for the
needed libraries.
add a function for MAKE_JUNK_C; initially code was added to
generate xemacs.def using this, but it will need to be rewritten.
add an rm -f for junk.c to avoid weird Cygwin bug with cp -f onto
an existing file.
Sort list of auto-detected functions and eliminate unused checks for
stpcpy, setlocale and getwd.
Add autodetection of Cygwin scanf problems
BETA: Rewrite section on configure to indicate what flags are important
and what not.
digest-doc.c, make-dump-id.c, profile.c, sorted-doc.c: Add proper decls for main().
make-msgfile.c: Document that this is old junk.
Move proposal to text.c.
make-msgfile.lex: Move proposal to text.c.
make-mswin-unicode.pl: Convert error-generating code so that the entire message will
be seen as a single unrecognized token.
mule/mule-ccl.el: Update docs.
lispref/mule.texi: Update CCL docs.
ldap/eldap.c: Mule-ize.
Use EXTERNAL_LIST_LOOP_2 instead of deleted EXTERNAL_LIST_LOOP.
* XEmacs 21.5.18 "chestnut" is released.
---------------------------------------------------------------
MULE-RELATED WORK:
---------------------------------------------------------------
---------------------------
byte-char conversion
---------------------------
buffer.c, buffer.h, insdel.c, text.c: Port FSF algorithm for byte-char conversion, replacing broken
previous version. Track the char position of the gap. Add
functions to do char-byte conversion downwards as well as upwards.
Move comments about algorithm workings to internals manual.
---------------------------
work on types
---------------------------
alloc.c, console-x-impl.h, dump-data.c, dump-data.h, dumper.c, dialog-msw.c, dired-msw.c, doc.c, editfns.c, esd.c, event-gtk.h, event-msw.c, events.c, file-coding.c, file-coding.h, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-x.c, glyphs.c, glyphs.h, gui.c, hpplay.c, imgproc.c, intl-win32.c, lrecord.h, lstream.c, keymap.c, lisp.h, libsst.c, linuxplay.c, miscplay.c, miscplay.h, mule-coding.c, nas.c, nt.c, ntheap.c, ntplay.c, objects-msw.c, objects-tty.c, objects-x.c, print.c, process-nt.c, process.c, redisplay.h, select-common.h, select-gtk.c, select-x.c, sgiplay.c, sound.c, sound.h, sunplay.c, sysfile.h, sysdep.c, syswindows.h, text.c, unexnt.c, win32.c, xgccache.c: Further work on types. This creates a full set of types for all
the basic semantics of `char' that I have so far identified, so that
its semantics can always be identified for the purposes of proper
Mule-safe code, and the raw use of `char' always avoided.
(1) More type renaming, for consistency of naming.
Char_ASCII -> Ascbyte
UChar_ASCII -> UAscbyte
Char_Binary -> CBinbyte
UChar_Binary -> Binbyte
SChar_Binary -> SBinbyte
(2) Introduce Rawbyte, CRawbyte, Boolbyte, Chbyte, UChbyte, and
Bitbyte and use them.
(3) New types Itext, Wexttext and Textcount for separating out
the concepts of bytes and textual units (different under UTF-16
and UTF-32, which are potential internal encodings).
(4) qxestr*_c -> qxestr*_ascii.
lisp.h: New; goes with other qxe() functions. #### Maybe goes in a
different section.
lisp.h: Group generic int-type defs together with EMACS_INT defs.
lisp.h: * lisp.h (WEXTTEXT_IS_WIDE)
New defns.
lisp.h: New type to replace places where int occurs as a boolean.
It's signed because occasionally people may want to use -1 as
an error value, and because unsigned ints are viral -- see comments
in the internals manual against using them.
dynarr.c: int -> Bytecount.
---------------------------
Mule-izing
---------------------------
device-x.c: Partially Mule-ize.
dumper.c, dumper.h: Mule-ize. Use Rawbyte. Use stderr_out not printf. Use wext_*().
sysdep.c, syswindows.h, text.c: New Wexttext API for manipulation of external text that may be
Unicode (e.g. startup code under Windows).
emacs.c: Mule-ize. Properly deal with argv in external encoding.
Use wext_*() and Wexttext. Use Rawbyte.
#if 0 some old junk on SCO that is unlikely to be correct.
Rewrite allocation code in run-temacs.
emacs.c, symsinit.h, win32.c: Rename win32 init function and call it even earlier, to
initialize mswindows_9x_p even earlier, for use in startup code
(XEUNICODE_P).
process.c: Use _wenviron not environ under Windows, to get Unicode environment
variables.
event-Xt.c: Mule-ize drag-n-drop related stuff.
dragdrop.c, dragdrop.h, frame-x.c: Mule-ize.
text.h: Add some more stand-in defines for particular kinds of conversion;
use in Mule-ization work in frame-x.c etc.
---------------------------
Freshening
---------------------------
intl-auto-encap-win32.c, intl-auto-encap-win32.h: Regenerate.
---------------------------
Unicode-work
---------------------------
intl-win32.c, syswindows.h: Factor out common options to MultiByteToWideChar and
WideCharToMultiByte. Add convert_unicode_to_multibyte_malloc()
and convert_unicode_to_multibyte_dynarr() and use. Add stuff for
alloca() conversion of multibyte/unicode.
alloc.c: Use dfc_external_data_len() in case of unicode coding system.
alloc.c, mule-charset.c: Don't zero out and reinit charset Unicode tables. This fucks up
dump-time loading. Anyway, either we load them at dump time or
run time, never both.
unicode.c: Dump the blank tables as well.
---------------------------------------------------------------
DOCUMENTATION, MOSTLY MULE-RELATED:
---------------------------------------------------------------
EmacsFrame.c, emodules.c, event-Xt.c, fileio.c, input-method-xlib.c, mule-wnnfns.c, redisplay-gtk.c, redisplay-tty.c, redisplay-x.c, regex.c, sysdep.c: Add comment about Mule work needed.
text.h: Add more documentation describing why DFC routines were not written
to return their value. Add some other DFC documentation.
console-msw.c, console-msw.h: Add pointer to docs in win32.c.
emacs.c: Add comments on sources of doc info.
text.c, charset.h, unicode.c, intl-win32.c, intl-encap-win32.c, text.h, file-coding.c, mule-coding.c: Collect background comments and related to text matters and
internationalization, and proposals for work to be done, in text.c
or Internals manual, stuff related to specific textual API's in
text.h, and stuff related to internal implementation of Unicode
conversion in unicode.c. Put lots of pointers to the comments to
make them easier to find.
s/mingw32.h, s/win32-common.h, s/win32-native.h, s/windowsnt.h, win32.c: Add bunches of new documentation on the different kinds of
builds and environments under Windows and how they work.
Collect this info in win32.c. Add pointers to these docs in
the relevant s/* files.
emacs.c: Document places with long comments.
Remove comment about exiting, move to internals manual, put
in pointer.
event-stream.c: Move docs about event queues and focus to internals manual, put
in pointer.
events.h: Move docs about event stream callbacks to internals manual, put
in pointer.
profile.c, redisplay.c, signal.c: Move documentation to the Internals manual.
process-nt.c: Add pointer to comment in win32-native.el.
lisp.h: Add comments about some comment conventions.
lisp.h: Add comment about the second argument.
device-msw.c, redisplay-msw.c: @@#### comments are out-of-date.
---------------------------------------------------------------
PDUMP WORK (MOTIVATED BY UNICODE CHANGES)
---------------------------------------------------------------
alloc.c, buffer.c, bytecode.c, console-impl.h, console.c, device.c, dumper.c, lrecord.h, elhash.c, emodules.h, events.c, extents.c, frame.c, glyphs.c, glyphs.h, mule-charset.c, mule-coding.c, objects.c, profile.c, rangetab.c, redisplay.c, specifier.c, specifier.h, window.c, lstream.c, file-coding.h, file-coding.c: PDUMP:
Properly implement dump_add_root_block(), which never worked before,
and is necessary for dumping Unicode tables.
Pdump name changes for accuracy:
XD_STRUCT_PTR -> XD_BLOCK_PTR.
XD_STRUCT_ARRAY -> XD_BLOCK_ARRAY.
XD_C_STRING -> XD_ASCII_STRING.
*_structure_* -> *_block_*.
lrecord.h: some comments added about
dump_add_root_block() vs dump_add_root_block_ptr().
extents.c: remove incorrect comment about pdump problems with gap array.
---------------------------------------------------------------
ALLOCATION
---------------------------------------------------------------
abbrev.c, alloc.c, bytecode.c, casefiddle.c, device-msw.c, device-x.c, dired-msw.c, doc.c, doprnt.c, dragdrop.c, editfns.c, emodules.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-msw.c, gui-x.c, imgproc.c, intl-win32.c, lread.c, menubar-gtk.c, menubar.c, nt.c, objects-msw.c, objects-x.c, print.c, process-nt.c, process-unix.c, process.c, realpath.c, redisplay.c, search.c, select-common.c, symbols.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: New macros {alloca,xnew}_{itext,{i,ext,raw,bin,asc}bytes} for
more convenient allocation of these commonly requested items.
Modify functions to use alloca_ibytes, alloca_array, alloca_extbytes,
xnew_ibytes, etc. also XREALLOC_ARRAY, xnew.
alloc.c: Rewrite the allocation functions to factor out repeated code.
Add assertions for freeing dumped data.
lisp.h: Moved down and consolidated with other allocation stuff.
lisp.h, dynarr.c: New functions for allocation that's very efficient when mostly in
LIFO order.
lisp.h, text.c, text.h: Factor out some stuff for general use by alloca()-conversion funs.
text.h, lisp.h: Fill out convenience routines for allocating various kinds of
bytes and put them in lisp.h. Use them in place of xmalloc(),
ALLOCA().
text.h: Fill out the convenience functions so the _MALLOC() kinds match
the alloca() kinds.
---------------------------------------------------------------
ERROR-CHECKING
---------------------------------------------------------------
text.h: Create ASSERT_ASCTEXT_ASCII() and ASSERT_ASCTEXT_ASCII_LEN()
from similar Eistring checkers and change the Eistring checkers to
use them instead.
---------------------------------------------------------------
MACROS IN LISP.H
---------------------------------------------------------------
lisp.h: Redo GCPRO declarations. Create a "base" set of functions that can
be used to generate any kind of gcpro sets -- regular, ngcpro,
nngcpro, private ones used in GC_EXTERNAL_LIST_LOOP_2.
buffer.c, callint.c, chartab.c, console-msw.c, device-x.c, dialog-msw.c, dired.c, extents.c, ui-gtk.c, rangetab.c, nt.c, mule-coding.c, minibuf.c, menubar-msw.c, menubar.c, menubar-gtk.c, lread.c, lisp.h, gutter.c, glyphs.c, glyphs-widget.c, fns.c, fileio.c, file-coding.c, specifier.c: Eliminate EXTERNAL_LIST_LOOP, which does not check for circularities.
Use EXTERNAL_LIST_LOOP_2 instead or EXTERNAL_LIST_LOOP_3
or EXTERNAL_PROPERTY_LIST_LOOP_3 or GC_EXTERNAL_LIST_LOOP_2
(new macro). Removed/redid comments on EXTERNAL_LIST_LOOP.
---------------------------------------------------------------
SPACING FIXES
---------------------------------------------------------------
callint.c, hftctl.c, number-gmp.c, process-unix.c: Spacing fixes.
---------------------------------------------------------------
FIX FOR GEOMETRY PROBLEM IN FIRST FRAME
---------------------------------------------------------------
unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by
release 1.5.12 of Cygwin].
toolbar.c: bug fix for problem of initial frame being 77 chars wide on Windows.
will be overridden by my other ws.
---------------------------------------------------------------
FIX FOR LEAKING PROCESS HANDLES:
---------------------------------------------------------------
process-nt.c: Fixes for leaking handles. Inspired by work done by Adrian Aichner
<adrian@xemacs.org>.
---------------------------------------------------------------
FIX FOR CYGWIN BUG (Unicode-related):
---------------------------------------------------------------
unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by
release 1.5.12 of Cygwin].
---------------------------------------------------------------
WARNING FIXES:
---------------------------------------------------------------
console-stream.c: `reinit' is unused.
compiler.h, event-msw.c, frame-msw.c, intl-encap-win32.c, text.h: Add stuff to deal with ANSI-aliasing warnings I got.
regex.c: Gather includes together to avoid warning.
---------------------------------------------------------------
CHANGES TO INITIALIZATION ROUTINES:
---------------------------------------------------------------
buffer.c, emacs.c, console.c, debug.c, device-x.c, device.c, dragdrop.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, font-lock.c, frame-msw.c, glyphs-widget.c, glyphs.c, gui-x.c, insdel.c, lread.c, lstream.c, menubar-gtk.c, menubar-x.c, minibuf.c, mule-wnnfns.c, objects-msw.c, objects.c, print.c, scrollbar-x.c, search.c, select-x.c, text.c, undo.c, unicode.c, window.c, symsinit.h: Call reinit_*() functions directly from emacs.c, for clarity.
Factor out some redundant init code. Move disallowed stuff
that had crept into vars_of_glyphs() into complex_vars_of_glyphs().
Call init_eval_semi_early() from eval.c not in the middle of
vars_of_() in emacs.c since there should be no order dependency
in the latter calls.
---------------------------------------------------------------
ARMAGEDDON:
---------------------------------------------------------------
alloc.c, emacs.c, lisp.h, print.c: Rename inhibit_non_essential_printing_operations to
inhibit_non_essential_conversion_operations.
text.c: Assert on !inhibit_non_essential_conversion_operations.
console-msw.c, print.c: Don't do conversion in SetConsoleTitle or FindWindow to avoid
problems during armageddon. Put #errors for NON_ASCII_INTERNAL_FORMAT
in places where problems would arise.
---------------------------------------------------------------
CHANGES TO THE BUILD PROCEDURE:
---------------------------------------------------------------
config.h.in, s/cxux.h, s/usg5-4-2.h, m/powerpc.h: Add comment about correct ordering of this file.
Rearrange everything to follow this -- put all #undefs together
and before the s&m files. Add undefs for HAVE_ALLOCA, C_ALLOCA,
BROKEN_ALLOCA_IN_FUNCTION_CALLS, STACK_DIRECTION. Remove unused
HAVE_STPCPY, HAVE_GETWD, HAVE_SETLOCALE.
m/gec63.h: Deleted; totally broken, not used at all, not in FSF.
m/7300.h, m/acorn.h, m/alliant-2800.h, m/alliant.h, m/altos.h, m/amdahl.h, m/apollo.h, m/att3b.h, m/aviion.h, m/celerity.h, m/clipper.h, m/cnvrgnt.h, m/convex.h, m/cydra5.h, m/delta.h, m/delta88k.h, m/dpx2.h, m/elxsi.h, m/ews4800r.h, m/gould.h, m/hp300bsd.h, m/hp800.h, m/hp9000s300.h, m/i860.h, m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h, m/intel386.h, m/iris4d.h, m/iris5d.h, m/iris6d.h, m/irist.h, m/isi-ov.h, m/luna88k.h, m/m68k.h, m/masscomp.h, m/mg1.h, m/mips-nec.h, m/mips-siemens.h, m/mips.h, m/news.h, m/nh3000.h, m/nh4000.h, m/ns32000.h, m/orion105.h, m/pfa50.h, m/plexus.h, m/pmax.h, m/powerpc.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h, m/sgi-challenge.h, m/symmetry.h, m/tad68k.h, m/tahoe.h, m/targon31.h, m/tekxd88.h, m/template.h, m/tower32.h, m/tower32v3.h, m/ustation.h, m/vax.h, m/wicat.h, m/xps100.h: Delete C_ALLOCA, HAVE_ALLOCA, STACK_DIRECTION,
BROKEN_ALLOCA_IN_FUNCTION_CALLS. All of this is auto-detected.
When in doubt, I followed recent FSF sources, which also have
these things deleted.
author | ben |
---|---|
date | Thu, 04 Nov 2004 23:08:28 +0000 |
parents | 13a418960a88 |
children | 308d34e9f07d |
rev | line source |
---|---|
428 | 1 /* undo handling for XEmacs. |
2 Copyright (C) 1990, 1992, 1993, 1994 Free Software Foundation, Inc. | |
3 | |
4 This file is part of XEmacs. | |
5 | |
6 XEmacs is free software; you can redistribute it and/or modify it | |
7 under the terms of the GNU General Public License as published by the | |
8 Free Software Foundation; either version 2, or (at your option) any | |
9 later version. | |
10 | |
11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
14 for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with XEmacs; see the file COPYING. If not, write to | |
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
19 Boston, MA 02111-1307, USA. */ | |
20 | |
21 /* Synched up with: FSF 19.28. */ | |
22 | |
23 /* This file has been Mule-ized. */ | |
24 | |
25 #include <config.h> | |
26 #include "lisp.h" | |
27 #include "buffer.h" | |
28 #include "extents.h" | |
29 | |
30 /* Maintained in event-stream.c */ | |
665 | 31 extern Charbpos last_point_position; |
428 | 32 extern Lisp_Object last_point_position_buffer; |
33 | |
34 /* Extent code needs to know about undo because the behavior of insert() | |
35 with regard to extents varies depending on whether we are inside | |
36 an undo or not. */ | |
37 int inside_undo; | |
38 | |
39 /* Last buffer for which undo information was recorded. */ | |
40 static Lisp_Object last_undo_buffer; | |
41 | |
42 Lisp_Object Qinhibit_read_only; | |
43 | |
44 /* The first time a command records something for undo. | |
45 it also allocates the undo-boundary object | |
46 which will be added to the list at the end of the command. | |
47 This ensures we can't run out of space while trying to make | |
48 an undo-boundary. */ | |
49 static Lisp_Object pending_boundary; | |
50 | |
51 static void | |
52 undo_boundary (struct buffer *b) | |
53 { | |
54 Lisp_Object tem = Fcar (b->undo_list); | |
55 if (!NILP (tem)) | |
56 { | |
57 /* One way or another, cons nil onto the front of the undo list. */ | |
58 if (CONSP (pending_boundary)) | |
59 { | |
60 /* If we have preallocated the cons cell to use here, | |
61 use that one. */ | |
62 XCDR (pending_boundary) = b->undo_list; | |
63 b->undo_list = pending_boundary; | |
64 pending_boundary = Qnil; | |
65 } | |
66 else | |
67 b->undo_list = Fcons (Qnil, b->undo_list); | |
68 } | |
69 } | |
70 | |
71 | |
72 static int | |
73 undo_prelude (struct buffer *b, int hack_pending_boundary) | |
74 { | |
75 if (EQ (b->undo_list, Qt)) | |
76 return (0); | |
77 | |
78 if (NILP (last_undo_buffer) | |
79 || (BUFFER_BASE_BUFFER (b) | |
80 != BUFFER_BASE_BUFFER (XBUFFER (last_undo_buffer)))) | |
81 { | |
82 undo_boundary (b); | |
793 | 83 last_undo_buffer = wrap_buffer (b); |
428 | 84 } |
85 | |
86 /* Allocate a cons cell to be the undo boundary after this command. */ | |
87 if (hack_pending_boundary && NILP (pending_boundary)) | |
88 pending_boundary = Fcons (Qnil, Qnil); | |
89 | |
90 if (BUF_MODIFF (b) <= BUF_SAVE_MODIFF (b)) | |
91 { | |
92 /* Record that an unmodified buffer is about to be changed. | |
93 Record the file modification date so that when undoing this | |
94 entry we can tell whether it is obsolete because the file was | |
95 saved again. */ | |
96 b->undo_list | |
97 = Fcons (Fcons (Qt, | |
98 Fcons (make_int ((b->modtime >> 16) & 0xffff), | |
99 make_int (b->modtime & 0xffff))), | |
100 b->undo_list); | |
101 } | |
102 return 1; | |
103 } | |
104 | |
105 | |
106 | |
107 /* Record an insertion that just happened or is about to happen, | |
108 for LENGTH characters at position BEG. | |
109 (It is possible to record an insertion before or after the fact | |
110 because we don't need to record the contents.) */ | |
111 | |
112 void | |
665 | 113 record_insert (struct buffer *b, Charbpos beg, Charcount length) |
428 | 114 { |
115 if (!undo_prelude (b, 1)) | |
116 return; | |
117 | |
118 /* If this is following another insertion and consecutive with it | |
119 in the buffer, combine the two. */ | |
120 if (CONSP (b->undo_list)) | |
121 { | |
122 Lisp_Object elt; | |
123 elt = XCAR (b->undo_list); | |
124 if (CONSP (elt) | |
125 && INTP (XCAR (elt)) | |
126 && INTP (XCDR (elt)) | |
127 && XINT (XCDR (elt)) == beg) | |
128 { | |
129 XCDR (elt) = make_int (beg + length); | |
130 return; | |
131 } | |
132 } | |
133 | |
134 b->undo_list = Fcons (Fcons (make_int (beg), | |
135 make_int (beg + length)), | |
136 b->undo_list); | |
137 } | |
138 | |
139 /* Record that a deletion is about to take place, | |
140 for LENGTH characters at location BEG. */ | |
141 | |
142 void | |
665 | 143 record_delete (struct buffer *b, Charbpos beg, Charcount length) |
428 | 144 { |
145 /* This function can GC */ | |
146 Lisp_Object sbeg; | |
147 int at_boundary; | |
148 | |
149 if (!undo_prelude (b, 1)) | |
150 return; | |
151 | |
152 at_boundary = (CONSP (b->undo_list) | |
153 && NILP (XCAR (b->undo_list))); | |
154 | |
155 if (BUF_PT (b) == beg + length) | |
156 sbeg = make_int (-beg); | |
157 else | |
158 sbeg = make_int (beg); | |
159 | |
160 /* If we are just after an undo boundary, and | |
161 point wasn't at start of deleted range, record where it was. */ | |
162 if (at_boundary | |
163 && BUFFERP (last_point_position_buffer) | |
164 && b == XBUFFER (last_point_position_buffer) | |
165 && last_point_position != XINT (sbeg)) | |
166 b->undo_list = Fcons (make_int (last_point_position), b->undo_list); | |
167 | |
168 b->undo_list = Fcons (Fcons (make_string_from_buffer (b, beg, | |
169 length), | |
170 sbeg), | |
171 b->undo_list); | |
172 } | |
173 | |
174 /* Record that a replacement is about to take place, | |
175 for LENGTH characters at location BEG. | |
176 The replacement does not change the number of characters. */ | |
177 | |
178 void | |
665 | 179 record_change (struct buffer *b, Charbpos beg, Charcount length) |
428 | 180 { |
181 record_delete (b, beg, length); | |
182 record_insert (b, beg, length); | |
183 } | |
184 | |
185 /* Record that an EXTENT is about to be attached or detached in its buffer. | |
186 This works much like a deletion or insertion, except that there's no string. | |
187 The tricky part is that the buffer we operate on comes from EXTENT. | |
188 Most extent changes happen as a side effect of string insertion and | |
189 deletion; this call is solely for Fdetach_extent() and Finsert_extent(). | |
190 */ | |
191 void | |
192 record_extent (Lisp_Object extent, int attached) | |
193 { | |
194 Lisp_Object obj = Fextent_object (extent); | |
195 | |
196 if (BUFFERP (obj)) | |
197 { | |
198 Lisp_Object token; | |
199 struct buffer *b = XBUFFER (obj); | |
200 if (!undo_prelude (b, 1)) | |
201 return; | |
202 if (attached) | |
203 token = extent; | |
204 else | |
205 token = list3 (extent, Fextent_start_position (extent), | |
206 Fextent_end_position (extent)); | |
207 b->undo_list = Fcons (token, b->undo_list); | |
208 } | |
209 else | |
210 return; | |
211 } | |
212 | |
213 #if 0 /* FSFmacs */ | |
214 /* Record a change in property PROP (whose old value was VAL) | |
215 for LENGTH characters starting at position BEG in BUFFER. */ | |
216 | |
665 | 217 record_property_change (Charbpos beg, Charcount length, |
428 | 218 Lisp_Object prop, Lisp_Object value, |
219 Lisp_Object buffer) | |
220 { | |
221 Lisp_Object lbeg, lend, entry; | |
222 struct buffer *b = XBUFFER (buffer); | |
223 | |
224 if (!undo_prelude (b, 1)) | |
225 return; | |
226 | |
227 lbeg = make_int (beg); | |
228 lend = make_int (beg + length); | |
229 entry = Fcons (Qnil, Fcons (prop, Fcons (value, Fcons (lbeg, lend)))); | |
230 b->undo_list = Fcons (entry, b->undo_list); | |
231 } | |
232 #endif /* FSFmacs */ | |
233 | |
234 | |
235 DEFUN ("undo-boundary", Fundo_boundary, 0, 0, 0, /* | |
236 Mark a boundary between units of undo. | |
237 An undo command will stop at this point, | |
238 but another undo command will undo to the previous boundary. | |
239 */ | |
240 ()) | |
241 { | |
242 if (EQ (current_buffer->undo_list, Qt)) | |
243 return Qnil; | |
244 undo_boundary (current_buffer); | |
245 return Qnil; | |
246 } | |
247 | |
248 /* At garbage collection time, make an undo list shorter at the end, | |
249 returning the truncated list. | |
250 MINSIZE and MAXSIZE are the limits on size allowed, as described below. | |
251 In practice, these are the values of undo-threshold and | |
252 undo-high-threshold. */ | |
253 | |
254 Lisp_Object | |
255 truncate_undo_list (Lisp_Object list, int minsize, int maxsize) | |
256 { | |
257 Lisp_Object prev, next, last_boundary; | |
258 int size_so_far = 0; | |
259 | |
260 if (!(minsize > 0 || maxsize > 0)) | |
261 return list; | |
262 | |
263 prev = Qnil; | |
264 next = list; | |
265 last_boundary = Qnil; | |
266 | |
267 if (!CONSP (list)) | |
268 return (list); | |
269 | |
270 /* Always preserve at least the most recent undo record. | |
271 If the first element is an undo boundary, skip past it. */ | |
272 if (CONSP (next) | |
273 && NILP (XCAR (next))) | |
274 { | |
275 /* Add in the space occupied by this element and its chain link. */ | |
440 | 276 size_so_far += sizeof (Lisp_Cons); |
428 | 277 |
278 /* Advance to next element. */ | |
279 prev = next; | |
280 next = XCDR (next); | |
281 } | |
282 while (CONSP (next) | |
283 && !NILP (XCAR (next))) | |
284 { | |
285 Lisp_Object elt; | |
286 elt = XCAR (next); | |
287 | |
288 /* Add in the space occupied by this element and its chain link. */ | |
440 | 289 size_so_far += sizeof (Lisp_Cons); |
428 | 290 if (CONSP (elt)) |
291 { | |
440 | 292 size_so_far += sizeof (Lisp_Cons); |
428 | 293 if (STRINGP (XCAR (elt))) |
440 | 294 size_so_far += (sizeof (Lisp_String) - 1 |
428 | 295 + XSTRING_LENGTH (XCAR (elt))); |
296 } | |
297 | |
298 /* Advance to next element. */ | |
299 prev = next; | |
300 next = XCDR (next); | |
301 } | |
302 if (CONSP (next)) | |
303 last_boundary = prev; | |
304 | |
305 while (CONSP (next)) | |
306 { | |
307 Lisp_Object elt; | |
308 elt = XCAR (next); | |
309 | |
310 /* When we get to a boundary, decide whether to truncate | |
311 either before or after it. The lower threshold, MINSIZE, | |
312 tells us to truncate after it. If its size pushes past | |
313 the higher threshold MAXSIZE as well, we truncate before it. */ | |
314 if (NILP (elt)) | |
315 { | |
316 if (size_so_far > maxsize && maxsize > 0) | |
317 break; | |
318 last_boundary = prev; | |
319 if (size_so_far > minsize && minsize > 0) | |
320 break; | |
321 } | |
322 | |
323 /* Add in the space occupied by this element and its chain link. */ | |
440 | 324 size_so_far += sizeof (Lisp_Cons); |
428 | 325 if (CONSP (elt)) |
326 { | |
440 | 327 size_so_far += sizeof (Lisp_Cons); |
428 | 328 if (STRINGP (XCAR (elt))) |
440 | 329 size_so_far += (sizeof (Lisp_String) - 1 |
428 | 330 + XSTRING_LENGTH (XCAR (elt))); |
331 } | |
332 | |
333 /* Advance to next element. */ | |
334 prev = next; | |
335 next = XCDR (next); | |
336 } | |
337 | |
338 /* If we scanned the whole list, it is short enough; don't change it. */ | |
339 if (NILP (next)) | |
340 return list; | |
341 | |
342 /* Truncate at the boundary where we decided to truncate. */ | |
343 if (!NILP (last_boundary)) | |
344 { | |
345 XCDR (last_boundary) = Qnil; | |
346 return list; | |
347 } | |
348 else | |
349 return Qnil; | |
350 } | |
351 | |
352 DEFUN ("primitive-undo", Fprimitive_undo, 2, 2, 0, /* | |
353 Undo COUNT records from the front of the list LIST. | |
354 Return what remains of the list. | |
355 */ | |
356 (count, list)) | |
357 { | |
358 struct gcpro gcpro1, gcpro2; | |
359 Lisp_Object next = Qnil; | |
360 /* This function can GC */ | |
361 int arg; | |
853 | 362 int speccount = internal_bind_int (&inside_undo, 1); |
428 | 363 |
364 #if 0 /* This is a good feature, but would make undo-start | |
365 unable to do what is expected. */ | |
366 Lisp_Object tem; | |
367 | |
368 /* If the head of the list is a boundary, it is the boundary | |
369 preceding this command. Get rid of it and don't count it. */ | |
370 tem = Fcar (list); | |
371 if (NILP (tem)) | |
372 list = Fcdr (list); | |
373 #endif | |
374 | |
375 CHECK_INT (count); | |
376 arg = XINT (count); | |
377 next = Qnil; | |
378 GCPRO2 (next, list); | |
379 | |
380 /* Don't let read-only properties interfere with undo. */ | |
381 if (NILP (current_buffer->read_only)) | |
382 specbind (Qinhibit_read_only, Qt); | |
383 | |
384 while (arg > 0) | |
385 { | |
386 while (1) | |
387 { | |
388 if (NILP (list)) | |
389 break; | |
390 else if (!CONSP (list)) | |
391 goto rotten; | |
392 next = XCAR (list); | |
393 list = XCDR (list); | |
394 /* Exit inner loop at undo boundary. */ | |
395 if (NILP (next)) | |
396 break; | |
397 /* Handle an integer by setting point to that value. */ | |
398 else if (INTP (next)) | |
399 BUF_SET_PT (current_buffer, | |
665 | 400 charbpos_clip_to_bounds (BUF_BEGV (current_buffer), |
428 | 401 XINT (next), |
402 BUF_ZV (current_buffer))); | |
403 else if (CONSP (next)) | |
404 { | |
405 Lisp_Object car = XCAR (next); | |
406 Lisp_Object cdr = XCDR (next); | |
407 | |
408 if (EQ (car, Qt)) | |
409 { | |
410 /* Element (t high . low) records previous modtime. */ | |
411 Lisp_Object high, low; | |
412 int mod_time; | |
413 if (!CONSP (cdr)) goto rotten; | |
414 high = XCAR (cdr); | |
415 low = XCDR (cdr); | |
416 if (!INTP (high) || !INTP (low)) goto rotten; | |
417 mod_time = (XINT (high) << 16) + XINT (low); | |
418 /* If this records an obsolete save | |
419 (not matching the actual disk file) | |
420 then don't mark unmodified. */ | |
421 if (mod_time != current_buffer->modtime) | |
422 break; | |
423 #ifdef CLASH_DETECTION | |
424 Funlock_buffer (); | |
425 #endif /* CLASH_DETECTION */ | |
2297 | 426 /* #### need to check if this can GC */ |
428 | 427 Fset_buffer_modified_p (Qnil, Qnil); |
428 } | |
429 else if (EXTENTP (car)) | |
430 { | |
431 /* Element (extent start end) means that EXTENT was | |
432 detached, and we need to reattach it. */ | |
433 Lisp_Object extent_obj, start, end; | |
434 | |
435 extent_obj = car; | |
436 start = Fcar (cdr); | |
437 end = Fcar (Fcdr (cdr)); | |
438 | |
439 if (!INTP (start) || !INTP (end)) | |
440 goto rotten; | |
441 Fset_extent_endpoints (extent_obj, start, end, | |
442 Fcurrent_buffer ()); | |
443 } | |
444 #if 0 /* FSFmacs */ | |
445 else if (EQ (car, Qnil)) | |
446 { | |
447 /* Element (nil prop val beg . end) is property change. */ | |
448 Lisp_Object beg, end, prop, val; | |
449 | |
450 prop = Fcar (cdr); | |
451 cdr = Fcdr (cdr); | |
452 val = Fcar (cdr); | |
453 cdr = Fcdr (cdr); | |
454 beg = Fcar (cdr); | |
455 end = Fcdr (cdr); | |
456 | |
457 Fput_text_property (beg, end, prop, val, Qnil); | |
458 } | |
459 #endif /* FSFmacs */ | |
460 else if (INTP (car) && INTP (cdr)) | |
461 { | |
462 /* Element (BEG . END) means range was inserted. */ | |
463 | |
464 if (XINT (car) < BUF_BEGV (current_buffer) | |
465 || XINT (cdr) > BUF_ZV (current_buffer)) | |
563 | 466 signal_error (Qinvalid_operation, "Changes to be undone are outside visible portion of buffer", Qunbound); |
428 | 467 /* Set point first thing, so that undoing this undo |
468 does not send point back to where it is now. */ | |
469 Fgoto_char (car, Qnil); | |
470 Fdelete_region (car, cdr, Qnil); | |
471 } | |
472 else if (STRINGP (car) && INTP (cdr)) | |
473 { | |
474 /* Element (STRING . POS) means STRING was deleted. */ | |
475 Lisp_Object membuf = car; | |
476 int pos = XINT (cdr); | |
477 | |
478 if (pos < 0) | |
479 { | |
480 if (-pos < BUF_BEGV (current_buffer) || -pos > BUF_ZV (current_buffer)) | |
563 | 481 signal_error (Qinvalid_operation, "Changes to be undone are outside visible portion of buffer", Qunbound); |
428 | 482 BUF_SET_PT (current_buffer, -pos); |
483 Finsert (1, &membuf); | |
484 } | |
485 else | |
486 { | |
487 if (pos < BUF_BEGV (current_buffer) || pos > BUF_ZV (current_buffer)) | |
563 | 488 signal_error (Qinvalid_operation, "Changes to be undone are outside visible portion of buffer", Qunbound); |
428 | 489 BUF_SET_PT (current_buffer, pos); |
490 | |
491 /* Insert before markers so that if the mark is | |
492 currently on the boundary of this deletion, it | |
493 ends up on the other side of the now-undeleted | |
494 text from point. Since undo doesn't even keep | |
495 track of the mark, this isn't really necessary, | |
496 but it may lead to better behavior in certain | |
497 situations. | |
498 | |
499 I'm doubtful that this is safe; you could mess | |
500 up the process-output mark in shell buffers, so | |
501 until I hear a compelling reason for this change, | |
502 I'm leaving it out. -jwz | |
503 */ | |
504 /* Finsert_before_markers (1, &membuf); */ | |
505 Finsert (1, &membuf); | |
506 BUF_SET_PT (current_buffer, pos); | |
507 } | |
508 } | |
509 else | |
510 { | |
511 goto rotten; | |
512 } | |
513 } | |
514 else if (EXTENTP (next)) | |
515 Fdetach_extent (next); | |
516 else | |
517 { | |
518 rotten: | |
563 | 519 signal_continuable_error |
520 (Qinvalid_state, | |
521 "Something rotten in the state of undo", next); | |
428 | 522 } |
523 } | |
524 arg--; | |
525 } | |
526 | |
527 UNGCPRO; | |
771 | 528 return unbind_to_1 (speccount, list); |
428 | 529 } |
530 | |
531 void | |
532 syms_of_undo (void) | |
533 { | |
534 DEFSUBR (Fprimitive_undo); | |
535 DEFSUBR (Fundo_boundary); | |
563 | 536 DEFSYMBOL (Qinhibit_read_only); |
428 | 537 } |
538 | |
539 void | |
540 reinit_vars_of_undo (void) | |
541 { | |
542 inside_undo = 0; | |
543 } | |
544 | |
545 void | |
546 vars_of_undo (void) | |
547 { | |
548 pending_boundary = Qnil; | |
549 staticpro (&pending_boundary); | |
550 last_undo_buffer = Qnil; | |
551 staticpro (&last_undo_buffer); | |
552 } |