1991-01-05 15:12:15 +00:00
|
|
|
|
/* Buffer insertion/deletion and gap motion for GNU Emacs.
|
1995-04-07 02:21:52 +00:00
|
|
|
|
Copyright (C) 1985, 1986, 1993, 1994, 1995 Free Software Foundation, Inc.
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
|
|
|
|
This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
|
|
GNU Emacs is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
1995-06-15 20:42:24 +00:00
|
|
|
|
the Free Software Foundation; either version 2, or (at your option)
|
1991-01-05 15:12:15 +00:00
|
|
|
|
any later version.
|
|
|
|
|
|
|
|
|
|
GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with GNU Emacs; see the file COPYING. If not, write to
|
1996-01-15 09:18:04 +00:00
|
|
|
|
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
|
Boston, MA 02111-1307, USA. */
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
|
|
|
|
|
1993-09-10 06:15:46 +00:00
|
|
|
|
#include <config.h>
|
1991-01-05 15:12:15 +00:00
|
|
|
|
#include "lisp.h"
|
1992-10-01 00:56:11 +00:00
|
|
|
|
#include "intervals.h"
|
1991-01-05 15:12:15 +00:00
|
|
|
|
#include "buffer.h"
|
1997-02-20 06:50:03 +00:00
|
|
|
|
#include "charset.h"
|
1991-01-05 15:12:15 +00:00
|
|
|
|
#include "window.h"
|
1993-04-07 22:11:21 +00:00
|
|
|
|
#include "blockinput.h"
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1995-05-05 03:02:02 +00:00
|
|
|
|
#define min(x, y) ((x) < (y) ? (x) : (y))
|
|
|
|
|
|
1994-04-08 00:44:35 +00:00
|
|
|
|
static void insert_from_string_1 ();
|
1994-10-22 04:45:57 +00:00
|
|
|
|
static void insert_from_buffer_1 ();
|
1994-04-26 02:11:35 +00:00
|
|
|
|
static void gap_left ();
|
|
|
|
|
static void gap_right ();
|
|
|
|
|
static void adjust_markers ();
|
1994-04-26 02:22:52 +00:00
|
|
|
|
static void adjust_point ();
|
1994-04-08 00:44:35 +00:00
|
|
|
|
|
1996-11-09 21:36:00 +00:00
|
|
|
|
Lisp_Object Fcombine_after_change_execute ();
|
|
|
|
|
|
|
|
|
|
/* Non-nil means don't call the after-change-functions right away,
|
|
|
|
|
just record an element in Vcombine_after_change_calls_list. */
|
|
|
|
|
Lisp_Object Vcombine_after_change_calls;
|
|
|
|
|
|
|
|
|
|
/* List of elements of the form (BEG-UNCHANGED END-UNCHANGED CHANGE-AMOUNT)
|
|
|
|
|
describing changes which happened while combine_after_change_calls
|
|
|
|
|
was nonzero. We use this to decide how to call them
|
|
|
|
|
once the deferral ends.
|
|
|
|
|
|
|
|
|
|
In each element.
|
|
|
|
|
BEG-UNCHANGED is the number of chars before the changed range.
|
|
|
|
|
END-UNCHANGED is the number of chars after the changed range,
|
|
|
|
|
and CHANGE-AMOUNT is the number of characters inserted by the change
|
|
|
|
|
(negative for a deletion). */
|
|
|
|
|
Lisp_Object combine_after_change_list;
|
|
|
|
|
|
|
|
|
|
/* Buffer which combine_after_change_list is about. */
|
|
|
|
|
Lisp_Object combine_after_change_buffer;
|
|
|
|
|
|
1991-01-05 15:12:15 +00:00
|
|
|
|
/* Move gap to position `pos'.
|
|
|
|
|
Note that this can quit! */
|
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
1991-01-05 15:12:15 +00:00
|
|
|
|
move_gap (pos)
|
|
|
|
|
int pos;
|
|
|
|
|
{
|
|
|
|
|
if (pos < GPT)
|
|
|
|
|
gap_left (pos, 0);
|
|
|
|
|
else if (pos > GPT)
|
|
|
|
|
gap_right (pos);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Move the gap to POS, which is less than the current GPT.
|
|
|
|
|
If NEWGAP is nonzero, then don't update beg_unchanged and end_unchanged. */
|
|
|
|
|
|
1994-04-26 02:11:35 +00:00
|
|
|
|
static void
|
1991-01-05 15:12:15 +00:00
|
|
|
|
gap_left (pos, newgap)
|
|
|
|
|
register int pos;
|
|
|
|
|
int newgap;
|
|
|
|
|
{
|
|
|
|
|
register unsigned char *to, *from;
|
|
|
|
|
register int i;
|
|
|
|
|
int new_s1;
|
|
|
|
|
|
|
|
|
|
pos--;
|
|
|
|
|
|
|
|
|
|
if (!newgap)
|
|
|
|
|
{
|
1996-09-15 01:57:44 +00:00
|
|
|
|
if (unchanged_modified == MODIFF
|
|
|
|
|
&& overlay_unchanged_modified == OVERLAY_MODIFF)
|
1991-01-05 15:12:15 +00:00
|
|
|
|
{
|
|
|
|
|
beg_unchanged = pos;
|
|
|
|
|
end_unchanged = Z - pos - 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (Z - GPT < end_unchanged)
|
|
|
|
|
end_unchanged = Z - GPT;
|
|
|
|
|
if (pos < beg_unchanged)
|
|
|
|
|
beg_unchanged = pos;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
i = GPT;
|
|
|
|
|
to = GAP_END_ADDR;
|
|
|
|
|
from = GPT_ADDR;
|
|
|
|
|
new_s1 = GPT - BEG;
|
|
|
|
|
|
|
|
|
|
/* Now copy the characters. To move the gap down,
|
|
|
|
|
copy characters up. */
|
|
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
/* I gets number of characters left to copy. */
|
|
|
|
|
i = new_s1 - pos;
|
|
|
|
|
if (i == 0)
|
|
|
|
|
break;
|
|
|
|
|
/* If a quit is requested, stop copying now.
|
|
|
|
|
Change POS to be where we have actually moved the gap to. */
|
|
|
|
|
if (QUITP)
|
|
|
|
|
{
|
|
|
|
|
pos = new_s1;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
/* Move at most 32000 chars before checking again for a quit. */
|
|
|
|
|
if (i > 32000)
|
|
|
|
|
i = 32000;
|
|
|
|
|
#ifdef GAP_USE_BCOPY
|
|
|
|
|
if (i >= 128
|
|
|
|
|
/* bcopy is safe if the two areas of memory do not overlap
|
|
|
|
|
or on systems where bcopy is always safe for moving upward. */
|
|
|
|
|
&& (BCOPY_UPWARD_SAFE
|
|
|
|
|
|| to - from >= 128))
|
|
|
|
|
{
|
|
|
|
|
/* If overlap is not safe, avoid it by not moving too many
|
|
|
|
|
characters at once. */
|
|
|
|
|
if (!BCOPY_UPWARD_SAFE && i > to - from)
|
|
|
|
|
i = to - from;
|
|
|
|
|
new_s1 -= i;
|
|
|
|
|
from -= i, to -= i;
|
|
|
|
|
bcopy (from, to, i);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
#endif
|
|
|
|
|
{
|
|
|
|
|
new_s1 -= i;
|
|
|
|
|
while (--i >= 0)
|
|
|
|
|
*--to = *--from;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Adjust markers, and buffer data structure, to put the gap at POS.
|
|
|
|
|
POS is where the loop above stopped, which may be what was specified
|
|
|
|
|
or may be where a quit was detected. */
|
|
|
|
|
adjust_markers (pos + 1, GPT, GAP_SIZE);
|
|
|
|
|
GPT = pos + 1;
|
1997-02-20 06:50:03 +00:00
|
|
|
|
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
|
1991-01-05 15:12:15 +00:00
|
|
|
|
QUIT;
|
|
|
|
|
}
|
|
|
|
|
|
1994-04-26 02:11:35 +00:00
|
|
|
|
static void
|
1991-01-05 15:12:15 +00:00
|
|
|
|
gap_right (pos)
|
|
|
|
|
register int pos;
|
|
|
|
|
{
|
|
|
|
|
register unsigned char *to, *from;
|
|
|
|
|
register int i;
|
|
|
|
|
int new_s1;
|
|
|
|
|
|
|
|
|
|
pos--;
|
|
|
|
|
|
1996-09-15 01:57:44 +00:00
|
|
|
|
if (unchanged_modified == MODIFF
|
|
|
|
|
&& overlay_unchanged_modified == OVERLAY_MODIFF)
|
|
|
|
|
|
1991-01-05 15:12:15 +00:00
|
|
|
|
{
|
|
|
|
|
beg_unchanged = pos;
|
|
|
|
|
end_unchanged = Z - pos - 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (Z - pos - 1 < end_unchanged)
|
|
|
|
|
end_unchanged = Z - pos - 1;
|
|
|
|
|
if (GPT - BEG < beg_unchanged)
|
|
|
|
|
beg_unchanged = GPT - BEG;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
i = GPT;
|
|
|
|
|
from = GAP_END_ADDR;
|
|
|
|
|
to = GPT_ADDR;
|
|
|
|
|
new_s1 = GPT - 1;
|
|
|
|
|
|
|
|
|
|
/* Now copy the characters. To move the gap up,
|
|
|
|
|
copy characters down. */
|
|
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
/* I gets number of characters left to copy. */
|
|
|
|
|
i = pos - new_s1;
|
|
|
|
|
if (i == 0)
|
|
|
|
|
break;
|
|
|
|
|
/* If a quit is requested, stop copying now.
|
|
|
|
|
Change POS to be where we have actually moved the gap to. */
|
|
|
|
|
if (QUITP)
|
|
|
|
|
{
|
|
|
|
|
pos = new_s1;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
/* Move at most 32000 chars before checking again for a quit. */
|
|
|
|
|
if (i > 32000)
|
|
|
|
|
i = 32000;
|
|
|
|
|
#ifdef GAP_USE_BCOPY
|
|
|
|
|
if (i >= 128
|
|
|
|
|
/* bcopy is safe if the two areas of memory do not overlap
|
|
|
|
|
or on systems where bcopy is always safe for moving downward. */
|
|
|
|
|
&& (BCOPY_DOWNWARD_SAFE
|
|
|
|
|
|| from - to >= 128))
|
|
|
|
|
{
|
|
|
|
|
/* If overlap is not safe, avoid it by not moving too many
|
|
|
|
|
characters at once. */
|
|
|
|
|
if (!BCOPY_DOWNWARD_SAFE && i > from - to)
|
|
|
|
|
i = from - to;
|
|
|
|
|
new_s1 += i;
|
|
|
|
|
bcopy (from, to, i);
|
|
|
|
|
from += i, to += i;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
#endif
|
|
|
|
|
{
|
|
|
|
|
new_s1 += i;
|
|
|
|
|
while (--i >= 0)
|
|
|
|
|
*to++ = *from++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
adjust_markers (GPT + GAP_SIZE, pos + 1 + GAP_SIZE, - GAP_SIZE);
|
|
|
|
|
GPT = pos + 1;
|
1997-02-20 06:50:03 +00:00
|
|
|
|
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
|
1991-01-05 15:12:15 +00:00
|
|
|
|
QUIT;
|
|
|
|
|
}
|
|
|
|
|
|
1996-02-03 18:06:29 +00:00
|
|
|
|
/* Add AMOUNT to the position of every marker in the current buffer
|
|
|
|
|
whose current position is between FROM (exclusive) and TO (inclusive).
|
|
|
|
|
|
1991-01-05 15:12:15 +00:00
|
|
|
|
Also, any markers past the outside of that interval, in the direction
|
|
|
|
|
of adjustment, are first moved back to the near end of the interval
|
1996-02-03 18:06:29 +00:00
|
|
|
|
and then adjusted by AMOUNT.
|
|
|
|
|
|
|
|
|
|
When the latter adjustment is done, if AMOUNT is negative,
|
|
|
|
|
we record the adjustment for undo. (This case happens only for
|
|
|
|
|
deletion.) */
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1994-04-26 02:11:35 +00:00
|
|
|
|
static void
|
1991-01-05 15:12:15 +00:00
|
|
|
|
adjust_markers (from, to, amount)
|
|
|
|
|
register int from, to, amount;
|
|
|
|
|
{
|
|
|
|
|
Lisp_Object marker;
|
|
|
|
|
register struct Lisp_Marker *m;
|
|
|
|
|
register int mpos;
|
|
|
|
|
|
1995-01-02 09:21:30 +00:00
|
|
|
|
marker = BUF_MARKERS (current_buffer);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1992-01-13 21:48:03 +00:00
|
|
|
|
while (!NILP (marker))
|
1991-01-05 15:12:15 +00:00
|
|
|
|
{
|
|
|
|
|
m = XMARKER (marker);
|
|
|
|
|
mpos = m->bufpos;
|
|
|
|
|
if (amount > 0)
|
|
|
|
|
{
|
|
|
|
|
if (mpos > to && mpos < to + amount)
|
|
|
|
|
mpos = to + amount;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
1996-02-03 18:06:29 +00:00
|
|
|
|
/* Here's the case where a marker is inside text being deleted.
|
|
|
|
|
AMOUNT can be negative for gap motion, too,
|
|
|
|
|
but then this range contains no markers. */
|
1991-01-05 15:12:15 +00:00
|
|
|
|
if (mpos > from + amount && mpos <= from)
|
1996-02-03 18:06:29 +00:00
|
|
|
|
{
|
|
|
|
|
record_marker_adjustment (marker, from + amount - mpos);
|
|
|
|
|
mpos = from + amount;
|
|
|
|
|
}
|
1991-01-05 15:12:15 +00:00
|
|
|
|
}
|
|
|
|
|
if (mpos > from && mpos <= to)
|
|
|
|
|
mpos += amount;
|
|
|
|
|
m->bufpos = mpos;
|
|
|
|
|
marker = m->chain;
|
|
|
|
|
}
|
|
|
|
|
}
|
1994-04-26 02:22:52 +00:00
|
|
|
|
|
1995-09-03 18:51:47 +00:00
|
|
|
|
/* Adjust markers whose insertion-type is t
|
|
|
|
|
for an insertion of AMOUNT characters at POS. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
adjust_markers_for_insert (pos, amount)
|
|
|
|
|
register int pos, amount;
|
|
|
|
|
{
|
|
|
|
|
Lisp_Object marker;
|
1997-02-20 06:50:03 +00:00
|
|
|
|
int adjusted = 0;
|
1995-09-03 18:51:47 +00:00
|
|
|
|
|
|
|
|
|
marker = BUF_MARKERS (current_buffer);
|
|
|
|
|
|
|
|
|
|
while (!NILP (marker))
|
|
|
|
|
{
|
|
|
|
|
register struct Lisp_Marker *m = XMARKER (marker);
|
|
|
|
|
if (m->insertion_type && m->bufpos == pos)
|
1997-02-20 06:50:03 +00:00
|
|
|
|
{
|
|
|
|
|
m->bufpos += amount;
|
|
|
|
|
adjusted = 1;
|
|
|
|
|
}
|
1995-09-03 18:51:47 +00:00
|
|
|
|
marker = m->chain;
|
|
|
|
|
}
|
1997-02-20 06:50:03 +00:00
|
|
|
|
if (adjusted)
|
|
|
|
|
/* Adjusting only markers whose insertion-type is t may result in
|
|
|
|
|
disordered overlays in the slot `overlays_before'. */
|
|
|
|
|
fix_overlays_before (current_buffer, pos, pos + amount);
|
1995-09-03 18:51:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
1994-04-26 02:22:52 +00:00
|
|
|
|
/* Add the specified amount to point. This is used only when the value
|
|
|
|
|
of point changes due to an insert or delete; it does not represent
|
|
|
|
|
a conceptual change in point as a marker. In particular, point is
|
|
|
|
|
not crossing any interval boundaries, so there's no need to use the
|
|
|
|
|
usual SET_PT macro. In fact it would be incorrect to do so, because
|
1996-01-05 10:03:17 +00:00
|
|
|
|
either the old or the new value of point is out of sync with the
|
1994-04-26 02:22:52 +00:00
|
|
|
|
current set of intervals. */
|
|
|
|
|
static void
|
|
|
|
|
adjust_point (amount)
|
1995-05-25 18:18:56 +00:00
|
|
|
|
int amount;
|
1994-04-26 02:22:52 +00:00
|
|
|
|
{
|
1995-01-02 09:21:30 +00:00
|
|
|
|
BUF_PT (current_buffer) += amount;
|
1994-04-26 02:22:52 +00:00
|
|
|
|
}
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
|
|
|
|
/* Make the gap INCREMENT characters longer. */
|
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
1991-01-05 15:12:15 +00:00
|
|
|
|
make_gap (increment)
|
|
|
|
|
int increment;
|
|
|
|
|
{
|
|
|
|
|
unsigned char *result;
|
|
|
|
|
Lisp_Object tem;
|
|
|
|
|
int real_gap_loc;
|
|
|
|
|
int old_gap_size;
|
|
|
|
|
|
|
|
|
|
/* If we have to get more space, get enough to last a while. */
|
|
|
|
|
increment += 2000;
|
|
|
|
|
|
1995-05-04 22:16:18 +00:00
|
|
|
|
/* Don't allow a buffer size that won't fit in an int
|
|
|
|
|
even if it will fit in a Lisp integer.
|
|
|
|
|
That won't work because so many places use `int'. */
|
|
|
|
|
|
1995-05-05 03:02:02 +00:00
|
|
|
|
if (Z - BEG + GAP_SIZE + increment
|
1995-10-31 02:34:16 +00:00
|
|
|
|
>= ((unsigned) 1 << (min (BITS_PER_INT, VALBITS) - 1)))
|
1995-05-05 03:02:02 +00:00
|
|
|
|
error ("Buffer exceeds maximum size");
|
1995-05-04 22:16:18 +00:00
|
|
|
|
|
Put interrupt input blocking in a separate file from xterm.h.
This isn't specific to X, and it allows us to avoid #including
xterm.h in files that don't really have anything to do with X.
* blockinput.h: New file.
* xterm.h (BLOCK_INPUT, UNBLOCK_INPUT, TOTALLY_UNBLOCK_INPUT,
UNBLOCK_INPUT_RESIGNAL): These are now in blockinput.h.
(x_input_blocked, x_pending_input): Deleted; there are analogs
in blockinput.h called interrupt_input_blocked and
interrupt_input_pending.
* keyboard.c (interrupt_input_blocked, interrupt_input_pending):
New variables, used by the macros in blockinput.h.
* xterm.c: #include blockinput.h.
(x_input_blocked, x_pending_input): Deleted.
(XTread_socket): Test and set interrupt_input_blocked and
interrupt_input_pending instead of the old variables.
* alloc.c, xfaces.c, xfns.c, xmenu.c, xselect.c, keymap.c:
#include blockinput.h.
* eval.c: #include blockinput.h instead of xterm.h.
* keyboard.c: #include blockinput.h.
(input_poll_signal): Just test
interrupt_input_blocked, instead of testing HAVE_X_WINDOWS and
x_input_blocked.
Block the processing of interrupt input while we're manipulating the
malloc heap.
* alloc.c: (xfree): New function, to make it easy to free things
safely.
(xmalloc, xrealloc): Block X input while doing the deed.
(VALIDATE_LISP_STORAGE, gc_sweep, compact_strings): Use xfree
instead of free.
(uninterrupt_malloc): New function, to install input-blocking
hooks into the GNU malloc routines.
* emacs.c [not SYSTEM_MALLOC] (main): Call uninterrupt_malloc
on startup.
* alloc.c: (make_interval, make_float, Fcons, Fmake_vector,
Fmake_symbol, Fmake_marker, make_uninit_string, Fgarbage_collect):
Use xmalloc instead of malloc; don't bother to check if out of
memory here.
(Fgarbage_collect): Call xrealloc instead of realloc.
* buffer.c: Use xmalloc and xfree instead of malloc and free;
don't bother to check if out of memory here.
(Fget_buffer_create): Put BLOCK_INPUT/UNBLOCK_INPUT pair around
calls to ralloc routines.
* insdel.c: Same.
* lisp.h (xfree): New extern declaration.
* xfaces.c (xfree): Don't #define this to be free; use the
definition in alloc.c.
* dispnew.c, doc.c, doprnt.c, fileio.c, lread.c, term.c, xfns.c,
xmenu.c, xterm.c: Use xfree instead of free.
* hftctl.c: Use xfree and xmalloc instead of free and malloc.
* keymap.c (current_minor_maps): BLOCK_INPUT while calling realloc
and malloc.
* search.c: Since the regexp routines can malloc, BLOCK_INPUT
while runing them. #include blockinput.h.
* sysdep.c: #include blockinput.h. Call xfree and xmalloc instead
of free and malloc. BLOCK_INPUT around routines which we know
will call malloc.
ymakefile (keyboard.o, keymap.o, search.o, sysdep.o, xfaces.o,
xfns.o, xmenu.o, xterm.o, xselect.o, alloc.o, eval.o): Note that
these depend on blockinput.h.
1993-03-31 10:55:33 +00:00
|
|
|
|
BLOCK_INPUT;
|
1997-02-20 06:50:03 +00:00
|
|
|
|
/* We allocate extra 1-byte `\0' at the tail for anchoring a search. */
|
|
|
|
|
result = BUFFER_REALLOC (BEG_ADDR, (Z - BEG + GAP_SIZE + increment + 1));
|
Put interrupt input blocking in a separate file from xterm.h.
This isn't specific to X, and it allows us to avoid #including
xterm.h in files that don't really have anything to do with X.
* blockinput.h: New file.
* xterm.h (BLOCK_INPUT, UNBLOCK_INPUT, TOTALLY_UNBLOCK_INPUT,
UNBLOCK_INPUT_RESIGNAL): These are now in blockinput.h.
(x_input_blocked, x_pending_input): Deleted; there are analogs
in blockinput.h called interrupt_input_blocked and
interrupt_input_pending.
* keyboard.c (interrupt_input_blocked, interrupt_input_pending):
New variables, used by the macros in blockinput.h.
* xterm.c: #include blockinput.h.
(x_input_blocked, x_pending_input): Deleted.
(XTread_socket): Test and set interrupt_input_blocked and
interrupt_input_pending instead of the old variables.
* alloc.c, xfaces.c, xfns.c, xmenu.c, xselect.c, keymap.c:
#include blockinput.h.
* eval.c: #include blockinput.h instead of xterm.h.
* keyboard.c: #include blockinput.h.
(input_poll_signal): Just test
interrupt_input_blocked, instead of testing HAVE_X_WINDOWS and
x_input_blocked.
Block the processing of interrupt input while we're manipulating the
malloc heap.
* alloc.c: (xfree): New function, to make it easy to free things
safely.
(xmalloc, xrealloc): Block X input while doing the deed.
(VALIDATE_LISP_STORAGE, gc_sweep, compact_strings): Use xfree
instead of free.
(uninterrupt_malloc): New function, to install input-blocking
hooks into the GNU malloc routines.
* emacs.c [not SYSTEM_MALLOC] (main): Call uninterrupt_malloc
on startup.
* alloc.c: (make_interval, make_float, Fcons, Fmake_vector,
Fmake_symbol, Fmake_marker, make_uninit_string, Fgarbage_collect):
Use xmalloc instead of malloc; don't bother to check if out of
memory here.
(Fgarbage_collect): Call xrealloc instead of realloc.
* buffer.c: Use xmalloc and xfree instead of malloc and free;
don't bother to check if out of memory here.
(Fget_buffer_create): Put BLOCK_INPUT/UNBLOCK_INPUT pair around
calls to ralloc routines.
* insdel.c: Same.
* lisp.h (xfree): New extern declaration.
* xfaces.c (xfree): Don't #define this to be free; use the
definition in alloc.c.
* dispnew.c, doc.c, doprnt.c, fileio.c, lread.c, term.c, xfns.c,
xmenu.c, xterm.c: Use xfree instead of free.
* hftctl.c: Use xfree and xmalloc instead of free and malloc.
* keymap.c (current_minor_maps): BLOCK_INPUT while calling realloc
and malloc.
* search.c: Since the regexp routines can malloc, BLOCK_INPUT
while runing them. #include blockinput.h.
* sysdep.c: #include blockinput.h. Call xfree and xmalloc instead
of free and malloc. BLOCK_INPUT around routines which we know
will call malloc.
ymakefile (keyboard.o, keymap.o, search.o, sysdep.o, xfaces.o,
xfns.o, xmenu.o, xterm.o, xselect.o, alloc.o, eval.o): Note that
these depend on blockinput.h.
1993-03-31 10:55:33 +00:00
|
|
|
|
|
1991-01-05 15:12:15 +00:00
|
|
|
|
if (result == 0)
|
1994-10-07 17:40:50 +00:00
|
|
|
|
{
|
|
|
|
|
UNBLOCK_INPUT;
|
|
|
|
|
memory_full ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We can't unblock until the new address is properly stored. */
|
1991-01-05 15:12:15 +00:00
|
|
|
|
BEG_ADDR = result;
|
1994-10-07 17:40:50 +00:00
|
|
|
|
UNBLOCK_INPUT;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
|
|
|
|
/* Prevent quitting in move_gap. */
|
|
|
|
|
tem = Vinhibit_quit;
|
|
|
|
|
Vinhibit_quit = Qt;
|
|
|
|
|
|
|
|
|
|
real_gap_loc = GPT;
|
|
|
|
|
old_gap_size = GAP_SIZE;
|
|
|
|
|
|
|
|
|
|
/* Call the newly allocated space a gap at the end of the whole space. */
|
|
|
|
|
GPT = Z + GAP_SIZE;
|
|
|
|
|
GAP_SIZE = increment;
|
|
|
|
|
|
|
|
|
|
/* Move the new gap down to be consecutive with the end of the old one.
|
|
|
|
|
This adjusts the markers properly too. */
|
|
|
|
|
gap_left (real_gap_loc + old_gap_size, 1);
|
|
|
|
|
|
|
|
|
|
/* Now combine the two into one large gap. */
|
|
|
|
|
GAP_SIZE += old_gap_size;
|
|
|
|
|
GPT = real_gap_loc;
|
|
|
|
|
|
1997-02-20 06:50:03 +00:00
|
|
|
|
/* Put an anchor. */
|
|
|
|
|
*(Z_ADDR) = 0;
|
|
|
|
|
|
1991-01-05 15:12:15 +00:00
|
|
|
|
Vinhibit_quit = tem;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Insert a string of specified length before point.
|
1994-10-22 04:45:57 +00:00
|
|
|
|
DO NOT use this for the contents of a Lisp string or a Lisp buffer!
|
|
|
|
|
prepare_to_modify_buffer could relocate the text. */
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
1991-01-05 15:12:15 +00:00
|
|
|
|
insert (string, length)
|
|
|
|
|
register unsigned char *string;
|
|
|
|
|
register length;
|
|
|
|
|
{
|
1994-04-08 00:44:35 +00:00
|
|
|
|
if (length > 0)
|
|
|
|
|
{
|
1995-01-11 01:40:25 +00:00
|
|
|
|
insert_1 (string, length, 0, 1);
|
1994-08-28 06:07:37 +00:00
|
|
|
|
signal_after_change (PT-length, 0, length);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
1994-08-28 06:07:37 +00:00
|
|
|
|
insert_and_inherit (string, length)
|
|
|
|
|
register unsigned char *string;
|
|
|
|
|
register length;
|
|
|
|
|
{
|
|
|
|
|
if (length > 0)
|
|
|
|
|
{
|
1995-01-11 01:40:25 +00:00
|
|
|
|
insert_1 (string, length, 1, 1);
|
1994-04-26 02:11:35 +00:00
|
|
|
|
signal_after_change (PT-length, 0, length);
|
1994-04-08 00:44:35 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
|
|
|
|
insert_1 (string, length, inherit, prepare)
|
1994-04-08 00:44:35 +00:00
|
|
|
|
register unsigned char *string;
|
1995-01-11 01:40:25 +00:00
|
|
|
|
register int length;
|
|
|
|
|
int inherit, prepare;
|
1994-04-08 00:44:35 +00:00
|
|
|
|
{
|
|
|
|
|
register Lisp_Object temp;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
if (prepare)
|
|
|
|
|
prepare_to_modify_buffer (PT, PT);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1994-04-26 02:11:35 +00:00
|
|
|
|
if (PT != GPT)
|
|
|
|
|
move_gap (PT);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
if (GAP_SIZE < length)
|
|
|
|
|
make_gap (length - GAP_SIZE);
|
|
|
|
|
|
1994-04-26 02:11:35 +00:00
|
|
|
|
record_insert (PT, length);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
MODIFF++;
|
|
|
|
|
|
|
|
|
|
bcopy (string, GPT_ADDR, length);
|
|
|
|
|
|
1994-09-02 23:30:24 +00:00
|
|
|
|
#ifdef USE_TEXT_PROPERTIES
|
1995-01-02 09:21:30 +00:00
|
|
|
|
if (BUF_INTERVALS (current_buffer) != 0)
|
1994-09-02 23:30:24 +00:00
|
|
|
|
/* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES. */
|
|
|
|
|
offset_intervals (current_buffer, PT, length);
|
|
|
|
|
#endif
|
1992-10-01 00:56:11 +00:00
|
|
|
|
|
1991-01-05 15:12:15 +00:00
|
|
|
|
GAP_SIZE -= length;
|
|
|
|
|
GPT += length;
|
|
|
|
|
ZV += length;
|
|
|
|
|
Z += length;
|
1997-02-20 06:50:03 +00:00
|
|
|
|
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
|
1995-04-17 23:16:23 +00:00
|
|
|
|
adjust_overlays_for_insert (PT, length);
|
1995-09-03 18:51:47 +00:00
|
|
|
|
adjust_markers_for_insert (PT, length);
|
1994-04-26 02:22:52 +00:00
|
|
|
|
adjust_point (length);
|
1994-08-28 06:07:37 +00:00
|
|
|
|
|
1994-09-02 23:30:24 +00:00
|
|
|
|
#ifdef USE_TEXT_PROPERTIES
|
1995-01-02 09:21:30 +00:00
|
|
|
|
if (!inherit && BUF_INTERVALS (current_buffer) != 0)
|
1994-08-28 06:07:37 +00:00
|
|
|
|
Fset_text_properties (make_number (PT - length), make_number (PT),
|
|
|
|
|
Qnil, Qnil);
|
1994-09-02 23:30:24 +00:00
|
|
|
|
#endif
|
1991-01-05 15:12:15 +00:00
|
|
|
|
}
|
|
|
|
|
|
1992-10-01 00:56:11 +00:00
|
|
|
|
/* Insert the part of the text of STRING, a Lisp object assumed to be
|
|
|
|
|
of type string, consisting of the LENGTH characters starting at
|
|
|
|
|
position POS. If the text of STRING has properties, they are absorbed
|
|
|
|
|
into the buffer.
|
|
|
|
|
|
|
|
|
|
It does not work to use `insert' for this, because a GC could happen
|
1991-05-08 06:23:29 +00:00
|
|
|
|
before we bcopy the stuff into the buffer, and relocate the string
|
|
|
|
|
without insert noticing. */
|
1992-10-01 00:56:11 +00:00
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
1993-09-14 12:08:02 +00:00
|
|
|
|
insert_from_string (string, pos, length, inherit)
|
1991-01-05 15:12:15 +00:00
|
|
|
|
Lisp_Object string;
|
|
|
|
|
register int pos, length;
|
1993-09-14 12:08:02 +00:00
|
|
|
|
int inherit;
|
1994-04-08 00:44:35 +00:00
|
|
|
|
{
|
|
|
|
|
if (length > 0)
|
|
|
|
|
{
|
|
|
|
|
insert_from_string_1 (string, pos, length, inherit);
|
1994-04-26 02:11:35 +00:00
|
|
|
|
signal_after_change (PT-length, 0, length);
|
1994-04-08 00:44:35 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
insert_from_string_1 (string, pos, length, inherit)
|
|
|
|
|
Lisp_Object string;
|
|
|
|
|
register int pos, length;
|
|
|
|
|
int inherit;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
{
|
|
|
|
|
register Lisp_Object temp;
|
|
|
|
|
struct gcpro gcpro1;
|
|
|
|
|
|
|
|
|
|
/* Make sure point-max won't overflow after this insertion. */
|
1994-10-04 12:09:34 +00:00
|
|
|
|
XSETINT (temp, length + Z);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
if (length + Z != XINT (temp))
|
|
|
|
|
error ("maximum buffer size exceeded");
|
|
|
|
|
|
|
|
|
|
GCPRO1 (string);
|
1994-04-26 02:11:35 +00:00
|
|
|
|
prepare_to_modify_buffer (PT, PT);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1994-04-26 02:11:35 +00:00
|
|
|
|
if (PT != GPT)
|
|
|
|
|
move_gap (PT);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
if (GAP_SIZE < length)
|
|
|
|
|
make_gap (length - GAP_SIZE);
|
|
|
|
|
|
1994-04-26 02:11:35 +00:00
|
|
|
|
record_insert (PT, length);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
MODIFF++;
|
|
|
|
|
UNGCPRO;
|
|
|
|
|
|
|
|
|
|
bcopy (XSTRING (string)->data, GPT_ADDR, length);
|
|
|
|
|
|
1992-10-01 00:56:11 +00:00
|
|
|
|
/* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
|
1994-04-26 02:11:35 +00:00
|
|
|
|
offset_intervals (current_buffer, PT, length);
|
1992-10-01 00:56:11 +00:00
|
|
|
|
|
1991-01-05 15:12:15 +00:00
|
|
|
|
GAP_SIZE -= length;
|
|
|
|
|
GPT += length;
|
|
|
|
|
ZV += length;
|
|
|
|
|
Z += length;
|
1997-02-20 06:50:03 +00:00
|
|
|
|
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
|
1995-04-17 23:16:23 +00:00
|
|
|
|
adjust_overlays_for_insert (PT, length);
|
1995-09-03 18:51:47 +00:00
|
|
|
|
adjust_markers_for_insert (PT, length);
|
1992-10-01 00:56:11 +00:00
|
|
|
|
|
|
|
|
|
/* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
|
1994-04-26 02:11:35 +00:00
|
|
|
|
graft_intervals_into_buffer (XSTRING (string)->intervals, PT, length,
|
1993-09-14 12:08:02 +00:00
|
|
|
|
current_buffer, inherit);
|
1992-10-01 00:56:11 +00:00
|
|
|
|
|
1994-04-26 02:22:52 +00:00
|
|
|
|
adjust_point (length);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
}
|
|
|
|
|
|
1994-10-22 04:45:57 +00:00
|
|
|
|
/* Insert text from BUF, starting at POS and having length LENGTH, into the
|
|
|
|
|
current buffer. If the text in BUF has properties, they are absorbed
|
|
|
|
|
into the current buffer.
|
|
|
|
|
|
|
|
|
|
It does not work to use `insert' for this, because a malloc could happen
|
|
|
|
|
and relocate BUF's text before the bcopy happens. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
insert_from_buffer (buf, pos, length, inherit)
|
|
|
|
|
struct buffer *buf;
|
|
|
|
|
int pos, length;
|
|
|
|
|
int inherit;
|
|
|
|
|
{
|
|
|
|
|
if (length > 0)
|
|
|
|
|
{
|
|
|
|
|
insert_from_buffer_1 (buf, pos, length, inherit);
|
|
|
|
|
signal_after_change (PT-length, 0, length);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
insert_from_buffer_1 (buf, pos, length, inherit)
|
|
|
|
|
struct buffer *buf;
|
|
|
|
|
int pos, length;
|
|
|
|
|
int inherit;
|
|
|
|
|
{
|
|
|
|
|
register Lisp_Object temp;
|
|
|
|
|
int chunk;
|
|
|
|
|
|
|
|
|
|
/* Make sure point-max won't overflow after this insertion. */
|
|
|
|
|
XSETINT (temp, length + Z);
|
|
|
|
|
if (length + Z != XINT (temp))
|
|
|
|
|
error ("maximum buffer size exceeded");
|
|
|
|
|
|
|
|
|
|
prepare_to_modify_buffer (PT, PT);
|
|
|
|
|
|
|
|
|
|
if (PT != GPT)
|
|
|
|
|
move_gap (PT);
|
|
|
|
|
if (GAP_SIZE < length)
|
|
|
|
|
make_gap (length - GAP_SIZE);
|
|
|
|
|
|
|
|
|
|
record_insert (PT, length);
|
|
|
|
|
MODIFF++;
|
|
|
|
|
|
|
|
|
|
if (pos < BUF_GPT (buf))
|
|
|
|
|
{
|
1994-10-25 07:53:05 +00:00
|
|
|
|
chunk = BUF_GPT (buf) - pos;
|
|
|
|
|
if (chunk > length)
|
|
|
|
|
chunk = length;
|
1994-10-22 04:45:57 +00:00
|
|
|
|
bcopy (BUF_CHAR_ADDRESS (buf, pos), GPT_ADDR, chunk);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
chunk = 0;
|
|
|
|
|
if (chunk < length)
|
|
|
|
|
bcopy (BUF_CHAR_ADDRESS (buf, pos + chunk),
|
|
|
|
|
GPT_ADDR + chunk, length - chunk);
|
|
|
|
|
|
|
|
|
|
#ifdef USE_TEXT_PROPERTIES
|
1995-01-02 09:21:30 +00:00
|
|
|
|
if (BUF_INTERVALS (current_buffer) != 0)
|
1994-10-22 04:45:57 +00:00
|
|
|
|
offset_intervals (current_buffer, PT, length);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
GAP_SIZE -= length;
|
|
|
|
|
GPT += length;
|
|
|
|
|
ZV += length;
|
|
|
|
|
Z += length;
|
1997-02-20 06:50:03 +00:00
|
|
|
|
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
|
1995-04-17 23:16:23 +00:00
|
|
|
|
adjust_overlays_for_insert (PT, length);
|
1995-09-03 18:51:47 +00:00
|
|
|
|
adjust_markers_for_insert (PT, length);
|
1994-10-22 04:45:57 +00:00
|
|
|
|
adjust_point (length);
|
|
|
|
|
|
|
|
|
|
/* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
|
1995-01-02 09:21:30 +00:00
|
|
|
|
graft_intervals_into_buffer (copy_intervals (BUF_INTERVALS (buf),
|
|
|
|
|
pos, length),
|
1994-10-22 04:45:57 +00:00
|
|
|
|
PT - length, length, current_buffer, inherit);
|
|
|
|
|
}
|
|
|
|
|
|
1991-01-05 15:12:15 +00:00
|
|
|
|
/* Insert the character C before point */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
insert_char (c)
|
1997-02-20 06:50:03 +00:00
|
|
|
|
int c;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
{
|
1997-02-20 06:50:03 +00:00
|
|
|
|
unsigned char workbuf[4], *str;
|
|
|
|
|
int len = CHAR_STRING (c, workbuf, str);
|
|
|
|
|
|
|
|
|
|
insert (str, len);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Insert the null-terminated string S before point */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
insert_string (s)
|
|
|
|
|
char *s;
|
|
|
|
|
{
|
|
|
|
|
insert (s, strlen (s));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Like `insert' except that all markers pointing at the place where
|
|
|
|
|
the insertion happens are adjusted to point after it.
|
|
|
|
|
Don't use this function to insert part of a Lisp string,
|
|
|
|
|
since gc could happen and relocate it. */
|
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
1991-01-05 15:12:15 +00:00
|
|
|
|
insert_before_markers (string, length)
|
|
|
|
|
unsigned char *string;
|
|
|
|
|
register int length;
|
|
|
|
|
{
|
1994-04-08 00:44:35 +00:00
|
|
|
|
if (length > 0)
|
|
|
|
|
{
|
1994-04-26 02:11:35 +00:00
|
|
|
|
register int opoint = PT;
|
1995-01-11 01:40:25 +00:00
|
|
|
|
insert_1 (string, length, 0, 1);
|
1994-04-08 00:44:35 +00:00
|
|
|
|
adjust_markers (opoint - 1, opoint, length);
|
1994-04-26 02:11:35 +00:00
|
|
|
|
signal_after_change (PT-length, 0, length);
|
1994-04-08 00:44:35 +00:00
|
|
|
|
}
|
1991-01-05 15:12:15 +00:00
|
|
|
|
}
|
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
1994-08-30 07:20:23 +00:00
|
|
|
|
insert_before_markers_and_inherit (string, length)
|
|
|
|
|
unsigned char *string;
|
|
|
|
|
register int length;
|
|
|
|
|
{
|
|
|
|
|
if (length > 0)
|
|
|
|
|
{
|
|
|
|
|
register int opoint = PT;
|
1995-01-11 01:40:25 +00:00
|
|
|
|
insert_1 (string, length, 1, 1);
|
1994-08-30 07:20:23 +00:00
|
|
|
|
adjust_markers (opoint - 1, opoint, length);
|
|
|
|
|
signal_after_change (PT-length, 0, length);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1991-01-05 15:12:15 +00:00
|
|
|
|
/* Insert part of a Lisp string, relocating markers after. */
|
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
1993-09-14 12:08:02 +00:00
|
|
|
|
insert_from_string_before_markers (string, pos, length, inherit)
|
1991-01-05 15:12:15 +00:00
|
|
|
|
Lisp_Object string;
|
|
|
|
|
register int pos, length;
|
1993-09-14 12:08:02 +00:00
|
|
|
|
int inherit;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
{
|
1994-04-08 00:44:35 +00:00
|
|
|
|
if (length > 0)
|
|
|
|
|
{
|
1994-04-26 02:11:35 +00:00
|
|
|
|
register int opoint = PT;
|
1994-04-08 00:44:35 +00:00
|
|
|
|
insert_from_string_1 (string, pos, length, inherit);
|
|
|
|
|
adjust_markers (opoint - 1, opoint, length);
|
1994-04-26 02:11:35 +00:00
|
|
|
|
signal_after_change (PT-length, 0, length);
|
1994-04-08 00:44:35 +00:00
|
|
|
|
}
|
1991-01-05 15:12:15 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Delete characters in current buffer
|
|
|
|
|
from FROM up to (but not including) TO. */
|
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
1991-01-05 15:12:15 +00:00
|
|
|
|
del_range (from, to)
|
|
|
|
|
register int from, to;
|
1994-03-02 00:55:05 +00:00
|
|
|
|
{
|
1995-01-11 01:40:25 +00:00
|
|
|
|
del_range_1 (from, to, 1);
|
1994-03-02 00:55:05 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Like del_range; PREPARE says whether to call prepare_to_modify_buffer. */
|
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
1994-03-02 00:55:05 +00:00
|
|
|
|
del_range_1 (from, to, prepare)
|
|
|
|
|
register int from, to, prepare;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
{
|
|
|
|
|
register int numdel;
|
|
|
|
|
|
|
|
|
|
/* Make args be valid */
|
|
|
|
|
if (from < BEGV)
|
|
|
|
|
from = BEGV;
|
|
|
|
|
if (to > ZV)
|
|
|
|
|
to = ZV;
|
|
|
|
|
|
|
|
|
|
if ((numdel = to - from) <= 0)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
/* Make sure the gap is somewhere in or next to what we are deleting. */
|
|
|
|
|
if (from > GPT)
|
|
|
|
|
gap_right (from);
|
|
|
|
|
if (to < GPT)
|
|
|
|
|
gap_left (to, 0);
|
|
|
|
|
|
1994-03-02 00:55:05 +00:00
|
|
|
|
if (prepare)
|
|
|
|
|
prepare_to_modify_buffer (from, to);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1996-02-03 18:06:29 +00:00
|
|
|
|
/* Relocate all markers pointing into the new, larger gap
|
|
|
|
|
to point at the end of the text before the gap.
|
|
|
|
|
This has to be done before recording the deletion,
|
|
|
|
|
so undo handles this after reinserting the text. */
|
|
|
|
|
adjust_markers (to + GAP_SIZE, to + GAP_SIZE, - numdel - GAP_SIZE);
|
|
|
|
|
|
1992-09-28 13:10:15 +00:00
|
|
|
|
record_delete (from, numdel);
|
|
|
|
|
MODIFF++;
|
|
|
|
|
|
1991-01-05 15:12:15 +00:00
|
|
|
|
/* Relocate point as if it were a marker. */
|
1994-04-26 02:11:35 +00:00
|
|
|
|
if (from < PT)
|
1994-04-26 02:22:52 +00:00
|
|
|
|
adjust_point (from - (PT < to ? PT : to));
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1993-03-01 08:55:35 +00:00
|
|
|
|
/* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
|
1993-12-23 01:19:25 +00:00
|
|
|
|
offset_intervals (current_buffer, from, - numdel);
|
1993-03-01 08:55:35 +00:00
|
|
|
|
|
1995-04-17 23:16:23 +00:00
|
|
|
|
/* Adjust the overlay center as needed. This must be done after
|
1995-07-20 20:02:38 +00:00
|
|
|
|
adjusting the markers that bound the overlays. */
|
1995-04-17 23:16:23 +00:00
|
|
|
|
adjust_overlays_for_delete (from, numdel);
|
|
|
|
|
|
1991-01-05 15:12:15 +00:00
|
|
|
|
GAP_SIZE += numdel;
|
|
|
|
|
ZV -= numdel;
|
|
|
|
|
Z -= numdel;
|
|
|
|
|
GPT = from;
|
1997-02-20 06:50:03 +00:00
|
|
|
|
*(GPT_ADDR) = 0; /* Put an anchor. */
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
|
|
|
|
if (GPT - BEG < beg_unchanged)
|
|
|
|
|
beg_unchanged = GPT - BEG;
|
|
|
|
|
if (Z - GPT < end_unchanged)
|
|
|
|
|
end_unchanged = Z - GPT;
|
|
|
|
|
|
1994-09-17 01:51:58 +00:00
|
|
|
|
evaporate_overlays (from);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
signal_after_change (from, numdel, 0);
|
|
|
|
|
}
|
|
|
|
|
|
1993-05-14 14:43:30 +00:00
|
|
|
|
/* Call this if you're about to change the region of BUFFER from START
|
|
|
|
|
to END. This checks the read-only properties of the region, calls
|
|
|
|
|
the necessary modification hooks, and warns the next redisplay that
|
|
|
|
|
it should pay attention to that area. */
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
1993-05-14 14:43:30 +00:00
|
|
|
|
modify_region (buffer, start, end)
|
|
|
|
|
struct buffer *buffer;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
int start, end;
|
|
|
|
|
{
|
1993-05-14 14:43:30 +00:00
|
|
|
|
struct buffer *old_buffer = current_buffer;
|
|
|
|
|
|
|
|
|
|
if (buffer != old_buffer)
|
|
|
|
|
set_buffer_internal (buffer);
|
|
|
|
|
|
1991-01-05 15:12:15 +00:00
|
|
|
|
prepare_to_modify_buffer (start, end);
|
|
|
|
|
|
1996-09-15 01:57:44 +00:00
|
|
|
|
if (start - 1 < beg_unchanged
|
|
|
|
|
|| (unchanged_modified == MODIFF
|
|
|
|
|
&& overlay_unchanged_modified == OVERLAY_MODIFF))
|
1991-01-05 15:12:15 +00:00
|
|
|
|
beg_unchanged = start - 1;
|
|
|
|
|
if (Z - end < end_unchanged
|
1996-09-15 01:57:44 +00:00
|
|
|
|
|| (unchanged_modified == MODIFF
|
|
|
|
|
&& overlay_unchanged_modified == OVERLAY_MODIFF))
|
1991-01-05 15:12:15 +00:00
|
|
|
|
end_unchanged = Z - end;
|
1993-12-23 01:19:25 +00:00
|
|
|
|
|
1995-01-02 09:21:30 +00:00
|
|
|
|
if (MODIFF <= SAVE_MODIFF)
|
1993-12-23 01:19:25 +00:00
|
|
|
|
record_first_change ();
|
1991-01-05 15:12:15 +00:00
|
|
|
|
MODIFF++;
|
1993-05-14 14:43:30 +00:00
|
|
|
|
|
1995-01-27 07:47:15 +00:00
|
|
|
|
buffer->point_before_scroll = Qnil;
|
|
|
|
|
|
1993-05-14 14:43:30 +00:00
|
|
|
|
if (buffer != old_buffer)
|
|
|
|
|
set_buffer_internal (old_buffer);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Check that it is okay to modify the buffer between START and END.
|
1992-10-01 00:56:11 +00:00
|
|
|
|
Run the before-change-function, if any. If intervals are in use,
|
|
|
|
|
verify that the text to be modified is not read-only, and call
|
|
|
|
|
any modification properties the text may have. */
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
1991-01-05 15:12:15 +00:00
|
|
|
|
prepare_to_modify_buffer (start, end)
|
1996-09-04 03:34:04 +00:00
|
|
|
|
int start, end;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
{
|
1992-01-13 21:48:03 +00:00
|
|
|
|
if (!NILP (current_buffer->read_only))
|
1991-01-05 15:12:15 +00:00
|
|
|
|
Fbarf_if_buffer_read_only ();
|
|
|
|
|
|
1992-10-01 00:56:11 +00:00
|
|
|
|
/* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
|
1995-01-02 09:21:30 +00:00
|
|
|
|
if (BUF_INTERVALS (current_buffer) != 0)
|
1994-09-02 23:30:24 +00:00
|
|
|
|
verify_interval_modification (current_buffer, start, end);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
|
|
|
|
#ifdef CLASH_DETECTION
|
1995-05-02 18:13:47 +00:00
|
|
|
|
if (!NILP (current_buffer->file_truename)
|
1995-07-20 20:47:20 +00:00
|
|
|
|
/* Make binding buffer-file-name to nil effective. */
|
|
|
|
|
&& !NILP (current_buffer->filename)
|
1995-01-02 09:21:30 +00:00
|
|
|
|
&& SAVE_MODIFF >= MODIFF)
|
1995-05-02 18:13:47 +00:00
|
|
|
|
lock_file (current_buffer->file_truename);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
#else
|
|
|
|
|
/* At least warn if this file has changed on disk since it was visited. */
|
1992-01-13 21:48:03 +00:00
|
|
|
|
if (!NILP (current_buffer->filename)
|
1995-01-02 09:21:30 +00:00
|
|
|
|
&& SAVE_MODIFF >= MODIFF
|
1992-01-13 21:48:03 +00:00
|
|
|
|
&& NILP (Fverify_visited_file_modtime (Fcurrent_buffer ()))
|
|
|
|
|
&& !NILP (Ffile_exists_p (current_buffer->filename)))
|
1991-01-05 15:12:15 +00:00
|
|
|
|
call1 (intern ("ask-user-about-supersession-threat"),
|
|
|
|
|
current_buffer->filename);
|
|
|
|
|
#endif /* not CLASH_DETECTION */
|
|
|
|
|
|
|
|
|
|
signal_before_change (start, end);
|
1993-03-07 09:33:13 +00:00
|
|
|
|
|
1994-10-08 22:14:58 +00:00
|
|
|
|
if (current_buffer->newline_cache)
|
|
|
|
|
invalidate_region_cache (current_buffer,
|
|
|
|
|
current_buffer->newline_cache,
|
|
|
|
|
start - BEG, Z - end);
|
|
|
|
|
if (current_buffer->width_run_cache)
|
|
|
|
|
invalidate_region_cache (current_buffer,
|
|
|
|
|
current_buffer->width_run_cache,
|
|
|
|
|
start - BEG, Z - end);
|
|
|
|
|
|
1993-03-07 09:33:13 +00:00
|
|
|
|
Vdeactivate_mark = Qt;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
}
|
|
|
|
|
|
1993-06-09 11:59:12 +00:00
|
|
|
|
/* Signal a change to the buffer immediately before it happens.
|
1996-09-04 03:34:04 +00:00
|
|
|
|
START_INT and END_INT are the bounds of the text to be changed. */
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
1996-09-10 19:52:09 +00:00
|
|
|
|
signal_before_change (start_int, end_int)
|
|
|
|
|
int start_int, end_int;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
{
|
1996-09-04 03:34:04 +00:00
|
|
|
|
Lisp_Object start, end;
|
|
|
|
|
|
|
|
|
|
start = make_number (start_int);
|
|
|
|
|
end = make_number (end_int);
|
|
|
|
|
|
1991-01-05 15:12:15 +00:00
|
|
|
|
/* If buffer is unmodified, run a special hook for that case. */
|
1995-01-02 09:21:30 +00:00
|
|
|
|
if (SAVE_MODIFF >= MODIFF
|
1993-01-26 01:58:16 +00:00
|
|
|
|
&& !NILP (Vfirst_change_hook)
|
|
|
|
|
&& !NILP (Vrun_hooks))
|
|
|
|
|
call1 (Vrun_hooks, Qfirst_change_hook);
|
|
|
|
|
|
1995-08-05 22:57:13 +00:00
|
|
|
|
/* Run the before-change-function if any.
|
|
|
|
|
We don't bother "binding" this variable to nil
|
|
|
|
|
because it is obsolete anyway and new code should not use it. */
|
1992-01-13 21:48:03 +00:00
|
|
|
|
if (!NILP (Vbefore_change_function))
|
1995-08-05 22:57:13 +00:00
|
|
|
|
call2 (Vbefore_change_function, start, end);
|
1994-04-10 02:34:02 +00:00
|
|
|
|
|
1995-08-05 22:57:13 +00:00
|
|
|
|
/* Now run the before-change-functions if any. */
|
1994-04-10 02:34:02 +00:00
|
|
|
|
if (!NILP (Vbefore_change_functions))
|
|
|
|
|
{
|
1995-08-05 22:57:13 +00:00
|
|
|
|
Lisp_Object args[3];
|
|
|
|
|
Lisp_Object before_change_functions;
|
|
|
|
|
Lisp_Object after_change_functions;
|
|
|
|
|
struct gcpro gcpro1, gcpro2;
|
|
|
|
|
|
|
|
|
|
/* "Bind" before-change-functions and after-change-functions
|
|
|
|
|
to nil--but in a way that errors don't know about.
|
|
|
|
|
That way, if there's an error in them, they will stay nil. */
|
|
|
|
|
before_change_functions = Vbefore_change_functions;
|
|
|
|
|
after_change_functions = Vafter_change_functions;
|
1995-08-07 17:53:17 +00:00
|
|
|
|
Vbefore_change_functions = Qnil;
|
|
|
|
|
Vafter_change_functions = Qnil;
|
1995-08-05 22:57:13 +00:00
|
|
|
|
GCPRO2 (before_change_functions, after_change_functions);
|
|
|
|
|
|
|
|
|
|
/* Actually run the hook functions. */
|
|
|
|
|
args[0] = Qbefore_change_functions;
|
|
|
|
|
args[1] = start;
|
|
|
|
|
args[2] = end;
|
|
|
|
|
run_hook_list_with_args (before_change_functions, 3, args);
|
|
|
|
|
|
|
|
|
|
/* "Unbind" the variables we "bound" to nil. */
|
|
|
|
|
Vbefore_change_functions = before_change_functions;
|
|
|
|
|
Vafter_change_functions = after_change_functions;
|
|
|
|
|
UNGCPRO;
|
1994-04-10 02:34:02 +00:00
|
|
|
|
}
|
1994-12-11 11:24:16 +00:00
|
|
|
|
|
|
|
|
|
if (!NILP (current_buffer->overlays_before)
|
|
|
|
|
|| !NILP (current_buffer->overlays_after))
|
1994-12-11 11:30:08 +00:00
|
|
|
|
report_overlay_modification (start, end, 0, start, end, Qnil);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
}
|
|
|
|
|
|
1993-06-09 11:59:12 +00:00
|
|
|
|
/* Signal a change immediately after it happens.
|
1991-01-05 15:12:15 +00:00
|
|
|
|
POS is the address of the start of the changed text.
|
|
|
|
|
LENDEL is the number of characters of the text before the change.
|
|
|
|
|
(Not the whole buffer; just the part that was changed.)
|
1996-05-01 21:25:49 +00:00
|
|
|
|
LENINS is the number of characters in that part of the text
|
|
|
|
|
after the change. */
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
1991-01-05 15:12:15 +00:00
|
|
|
|
signal_after_change (pos, lendel, lenins)
|
|
|
|
|
int pos, lendel, lenins;
|
|
|
|
|
{
|
1996-11-09 21:36:00 +00:00
|
|
|
|
/* If we are deferring calls to the after-change functions
|
|
|
|
|
and there are no before-change functions,
|
|
|
|
|
just record the args that we were going to use. */
|
|
|
|
|
if (! NILP (Vcombine_after_change_calls)
|
|
|
|
|
&& NILP (Vbefore_change_function) && NILP (Vbefore_change_functions)
|
|
|
|
|
&& NILP (current_buffer->overlays_before)
|
|
|
|
|
&& NILP (current_buffer->overlays_after))
|
|
|
|
|
{
|
|
|
|
|
Lisp_Object elt;
|
|
|
|
|
|
|
|
|
|
if (!NILP (combine_after_change_list)
|
|
|
|
|
&& current_buffer != XBUFFER (combine_after_change_buffer))
|
|
|
|
|
Fcombine_after_change_execute ();
|
|
|
|
|
|
|
|
|
|
elt = Fcons (make_number (pos - BEG),
|
|
|
|
|
Fcons (make_number (Z - (pos - lendel + lenins)),
|
|
|
|
|
Fcons (make_number (lenins - lendel), Qnil)));
|
|
|
|
|
combine_after_change_list
|
|
|
|
|
= Fcons (elt, combine_after_change_list);
|
|
|
|
|
combine_after_change_buffer = Fcurrent_buffer ();
|
|
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!NILP (combine_after_change_list))
|
|
|
|
|
Fcombine_after_change_execute ();
|
|
|
|
|
|
1995-08-05 22:57:13 +00:00
|
|
|
|
/* Run the after-change-function if any.
|
|
|
|
|
We don't bother "binding" this variable to nil
|
|
|
|
|
because it is obsolete anyway and new code should not use it. */
|
1992-01-13 21:48:03 +00:00
|
|
|
|
if (!NILP (Vafter_change_function))
|
1995-08-05 22:57:13 +00:00
|
|
|
|
call3 (Vafter_change_function,
|
|
|
|
|
make_number (pos), make_number (pos + lenins),
|
|
|
|
|
make_number (lendel));
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1994-04-10 02:34:02 +00:00
|
|
|
|
if (!NILP (Vafter_change_functions))
|
|
|
|
|
{
|
1995-08-05 22:57:13 +00:00
|
|
|
|
Lisp_Object args[4];
|
|
|
|
|
Lisp_Object before_change_functions;
|
|
|
|
|
Lisp_Object after_change_functions;
|
|
|
|
|
struct gcpro gcpro1, gcpro2;
|
|
|
|
|
|
|
|
|
|
/* "Bind" before-change-functions and after-change-functions
|
|
|
|
|
to nil--but in a way that errors don't know about.
|
|
|
|
|
That way, if there's an error in them, they will stay nil. */
|
|
|
|
|
before_change_functions = Vbefore_change_functions;
|
|
|
|
|
after_change_functions = Vafter_change_functions;
|
1995-08-07 17:53:17 +00:00
|
|
|
|
Vbefore_change_functions = Qnil;
|
|
|
|
|
Vafter_change_functions = Qnil;
|
1995-08-05 22:57:13 +00:00
|
|
|
|
GCPRO2 (before_change_functions, after_change_functions);
|
|
|
|
|
|
|
|
|
|
/* Actually run the hook functions. */
|
|
|
|
|
args[0] = Qafter_change_functions;
|
|
|
|
|
XSETFASTINT (args[1], pos);
|
|
|
|
|
XSETFASTINT (args[2], pos + lenins);
|
|
|
|
|
XSETFASTINT (args[3], lendel);
|
|
|
|
|
run_hook_list_with_args (after_change_functions,
|
|
|
|
|
4, args);
|
|
|
|
|
|
|
|
|
|
/* "Unbind" the variables we "bound" to nil. */
|
|
|
|
|
Vbefore_change_functions = before_change_functions;
|
|
|
|
|
Vafter_change_functions = after_change_functions;
|
|
|
|
|
UNGCPRO;
|
1994-04-10 02:34:02 +00:00
|
|
|
|
}
|
1994-12-11 11:24:16 +00:00
|
|
|
|
|
|
|
|
|
if (!NILP (current_buffer->overlays_before)
|
|
|
|
|
|| !NILP (current_buffer->overlays_after))
|
1994-12-11 11:30:08 +00:00
|
|
|
|
report_overlay_modification (make_number (pos),
|
1996-05-01 21:25:49 +00:00
|
|
|
|
make_number (pos + lenins),
|
1994-12-11 11:24:16 +00:00
|
|
|
|
1,
|
|
|
|
|
make_number (pos), make_number (pos + lenins),
|
|
|
|
|
make_number (lendel));
|
1995-09-12 17:37:02 +00:00
|
|
|
|
|
|
|
|
|
/* After an insertion, call the text properties
|
|
|
|
|
insert-behind-hooks or insert-in-front-hooks. */
|
|
|
|
|
if (lendel == 0)
|
|
|
|
|
report_interval_modification (pos, pos + lenins);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
}
|
1996-11-09 21:36:00 +00:00
|
|
|
|
|
|
|
|
|
Lisp_Object
|
|
|
|
|
Fcombine_after_change_execute_1 (val)
|
|
|
|
|
Lisp_Object val;
|
|
|
|
|
{
|
|
|
|
|
Vcombine_after_change_calls = val;
|
|
|
|
|
return val;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
DEFUN ("combine-after-change-execute", Fcombine_after_change_execute,
|
|
|
|
|
Scombine_after_change_execute, 0, 0, 0,
|
|
|
|
|
"This function is for use internally in `combine-after-change-calls'.")
|
|
|
|
|
()
|
|
|
|
|
{
|
|
|
|
|
register Lisp_Object val;
|
|
|
|
|
int count = specpdl_ptr - specpdl;
|
|
|
|
|
int beg, end, change;
|
|
|
|
|
int begpos, endpos;
|
|
|
|
|
Lisp_Object tail;
|
|
|
|
|
|
|
|
|
|
record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
|
|
|
|
|
|
|
|
|
|
Fset_buffer (combine_after_change_buffer);
|
|
|
|
|
|
|
|
|
|
/* # chars unchanged at beginning of buffer. */
|
|
|
|
|
beg = Z - BEG;
|
|
|
|
|
/* # chars unchanged at end of buffer. */
|
|
|
|
|
end = beg;
|
|
|
|
|
/* Total amount of insertion (negative for deletion). */
|
|
|
|
|
change = 0;
|
|
|
|
|
|
|
|
|
|
/* Scan the various individual changes,
|
|
|
|
|
accumulating the range info in BEG, END and CHANGE. */
|
|
|
|
|
for (tail = combine_after_change_list; CONSP (tail);
|
|
|
|
|
tail = XCONS (tail)->cdr)
|
|
|
|
|
{
|
|
|
|
|
Lisp_Object elt, thisbeg, thisend, thischange;
|
|
|
|
|
|
|
|
|
|
/* Extract the info from the next element. */
|
|
|
|
|
elt = XCONS (tail)->car;
|
|
|
|
|
if (! CONSP (elt))
|
|
|
|
|
continue;
|
|
|
|
|
thisbeg = XINT (XCONS (elt)->car);
|
|
|
|
|
|
|
|
|
|
elt = XCONS (elt)->cdr;
|
|
|
|
|
if (! CONSP (elt))
|
|
|
|
|
continue;
|
|
|
|
|
thisend = XINT (XCONS (elt)->car);
|
|
|
|
|
|
|
|
|
|
elt = XCONS (elt)->cdr;
|
|
|
|
|
if (! CONSP (elt))
|
|
|
|
|
continue;
|
|
|
|
|
thischange = XINT (XCONS (elt)->car);
|
|
|
|
|
|
|
|
|
|
/* Merge this range into the accumulated range. */
|
|
|
|
|
change += thischange;
|
|
|
|
|
if (thisbeg < beg)
|
|
|
|
|
beg = thisbeg;
|
|
|
|
|
if (thisend < end)
|
|
|
|
|
end = thisend;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Get the current start and end positions of the range
|
|
|
|
|
that was changed. */
|
|
|
|
|
begpos = BEG + beg;
|
|
|
|
|
endpos = Z - end;
|
|
|
|
|
|
|
|
|
|
/* We are about to handle these, so discard them. */
|
|
|
|
|
combine_after_change_list = Qnil;
|
|
|
|
|
|
|
|
|
|
/* Now run the after-change functions for real.
|
|
|
|
|
Turn off the flag that defers them. */
|
|
|
|
|
record_unwind_protect (Fcombine_after_change_execute_1,
|
|
|
|
|
Vcombine_after_change_calls);
|
|
|
|
|
signal_after_change (begpos, endpos - begpos - change, endpos - begpos);
|
|
|
|
|
|
|
|
|
|
return unbind_to (count, val);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
syms_of_insdel ()
|
|
|
|
|
{
|
|
|
|
|
staticpro (&combine_after_change_list);
|
|
|
|
|
combine_after_change_list = Qnil;
|
|
|
|
|
|
|
|
|
|
DEFVAR_LISP ("combine-after-change-calls", &Vcombine_after_change_calls,
|
|
|
|
|
"Used internally by the `combine-after-change-calls' macro.");
|
|
|
|
|
Vcombine_after_change_calls = Qnil;
|
|
|
|
|
|
|
|
|
|
defsubr (&Scombine_after_change_execute);
|
|
|
|
|
}
|