/* Buffer insertion/deletion and gap motion for GNU Emacs.
- Copyright (C) 1985, 86, 93, 94, 95, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1985, 86,93,94,95,97,98, 1999, 2000 Free Software Foundation, Inc.
This file is part of GNU Emacs.
#include "charset.h"
#include "window.h"
#include "blockinput.h"
+#include "region-cache.h"
#ifndef NULL
#define NULL 0
#endif
#define min(x, y) ((x) < (y) ? (x) : (y))
+#define max(x, y) ((x) > (y) ? (x) : (y))
static void insert_from_string_1 P_ ((Lisp_Object, int, int, int, int, int, int));
static void insert_from_buffer_1 ();
static void gap_right P_ ((int, int));
static void adjust_markers_gap_motion P_ ((int, int, int));
static void adjust_markers_for_insert P_ ((int, int, int, int, int));
-static void adjust_markers_for_delete P_ ((int, int, int, int));
+void adjust_markers_for_delete P_ ((int, int, int, int));
+static void adjust_markers_for_replace P_ ((int, int, int, int, int, int));
static void adjust_point P_ ((int, int));
Lisp_Object Fcombine_after_change_execute ();
/* Buffer which combine_after_change_list is about. */
Lisp_Object combine_after_change_buffer;
+\f
+/* Check all markers in the current buffer, looking for something invalid. */
+
+static int check_markers_debug_flag;
+
+#define CHECK_MARKERS() \
+ if (check_markers_debug_flag) \
+ check_markers (); \
+ else
-#define DEFAULT_NONASCII_INSERT_OFFSET 0x800
+void
+check_markers ()
+{
+ register Lisp_Object tail;
+ int multibyte = ! NILP (current_buffer->enable_multibyte_characters);
+
+ tail = BUF_MARKERS (current_buffer);
+
+ while (! NILP (tail))
+ {
+ if (XMARKER (tail)->buffer->text != current_buffer->text)
+ abort ();
+ if (XMARKER (tail)->charpos > Z)
+ abort ();
+ if (XMARKER (tail)->bytepos > Z_BYTE)
+ abort ();
+ if (multibyte && ! CHAR_HEAD_P (FETCH_BYTE (XMARKER (tail)->bytepos)))
+ abort ();
+
+ tail = XMARKER (tail)->chain;
+ }
+}
\f
/* Move gap to position CHARPOS.
Note that this can quit! */
int new_s1;
if (!newgap)
- {
- if (unchanged_modified == MODIFF
- && overlay_unchanged_modified == OVERLAY_MODIFF)
- {
- beg_unchanged = charpos - BEG;
- end_unchanged = Z - charpos;
- }
- else
- {
- if (Z - GPT < end_unchanged)
- end_unchanged = Z - GPT;
- if (charpos < beg_unchanged)
- beg_unchanged = charpos - BEG;
- }
- }
+ BUF_COMPUTE_UNCHANGED (current_buffer, charpos, GPT);
i = GPT_BYTE;
to = GAP_END_ADDR;
register int i;
int new_s1;
- if (unchanged_modified == MODIFF
- && overlay_unchanged_modified == OVERLAY_MODIFF)
- {
- beg_unchanged = charpos - BEG;
- end_unchanged = Z - charpos;
- }
- else
- {
- if (Z - charpos - 1 < end_unchanged)
- end_unchanged = Z - charpos;
- if (GPT - BEG < beg_unchanged)
- beg_unchanged = GPT - BEG;
- }
+ BUF_COMPUTE_UNCHANGED (current_buffer, charpos, GPT);
i = GPT_BYTE;
from = GAP_END_ADDR;
This function assumes that the gap is adjacent to
or inside of the range being deleted. */
-static void
+void
adjust_markers_for_delete (from, from_byte, to, to_byte)
register int from, from_byte, to, to_byte;
{
Lisp_Object marker;
register struct Lisp_Marker *m;
register int charpos;
- /* This is what GAP_SIZE will be when this deletion is finished. */
- int coming_gap_size = GAP_SIZE + to_byte - from_byte;
marker = BUF_MARKERS (current_buffer);
m->charpos -= to - from;
m->bytepos -= to_byte - from_byte;
}
-
/* Here's the case where a marker is inside text being deleted. */
else if (charpos > from)
{
- record_marker_adjustment (marker, from - charpos);
+ if (! m->insertion_type)
+ /* Normal markers will end up at the beginning of the
+ re-inserted text after undoing a deletion, and must be
+ adjusted to move them to the correct place. */
+ record_marker_adjustment (marker, from - charpos);
+ else if (charpos < to)
+ /* Before-insertion markers will automatically move forward
+ upon re-inserting the deleted text, so we have to arrange
+ for them to move backward to the correct position. */
+ record_marker_adjustment (marker, charpos - to);
+
m->charpos = from;
m->bytepos = from_byte;
}
-
- /* In a single-byte buffer, a marker's two positions must be equal. */
- if (Z == Z_BYTE)
+ /* Here's the case where a before-insertion marker is immediately
+ before the deleted region. */
+ else if (charpos == from && m->insertion_type)
{
- register int i = m->bytepos;
-
-#if 0
- /* We use FROM_BYTE here instead of GPT_BYTE
- because FROM_BYTE is where the gap will be after the deletion. */
- if (i > from_byte + coming_gap_size)
- i -= coming_gap_size;
- else if (i > from_byte)
- i = from_byte;
-#endif
-
- if (m->charpos != i)
- abort ();
+ /* Undoing the change uses normal insertion, which will
+ incorrectly make MARKER move forward, so we arrange for it
+ to then move backward to the correct place at the beginning
+ of the deleted region. */
+ record_marker_adjustment (marker, to - from);
}
marker = m->chain;
}
}
-\f
-/* Adjust markers for an insertion at CHARPOS / BYTEPOS
- consisting of NCHARS chars, which are NBYTES bytes.
- We have to relocate the charpos of every marker that points
- after the insertion (but not their bytepos).
+\f
+/* Adjust markers for an insertion that stretches from FROM / FROM_BYTE
+ to TO / TO_BYTE. We have to relocate the charpos of every marker
+ that points after the insertion (but not their bytepos).
When a marker points at the insertion point,
we advance it if either its insertion-type is t
static void
adjust_markers_for_insert (from, from_byte, to, to_byte, before_markers)
- register int from, from_byte, to, to_byte, before_markers;
+ register int from, from_byte, to, to_byte;
+ int before_markers;
{
Lisp_Object marker;
int adjusted = 0;
while (!NILP (marker))
{
register struct Lisp_Marker *m = XMARKER (marker);
- if (m->bytepos == from_byte
- && (m->insertion_type || before_markers))
+
+ /* In a single-byte buffer, a marker's two positions must be
+ equal. */
+ if (Z == Z_BYTE)
{
- m->bytepos += nbytes;
- m->charpos += nchars;
- if (m->insertion_type)
- adjusted = 1;
+ if (m->charpos != m->bytepos)
+ abort ();
+ }
+
+ if (m->bytepos == from_byte)
+ {
+ if (m->insertion_type || before_markers)
+ {
+ m->bytepos = to_byte;
+ m->charpos = to;
+ if (m->insertion_type)
+ adjusted = 1;
+ }
}
else if (m->bytepos > from_byte)
{
m->charpos += nchars;
}
- /* In a single-byte buffer, a marker's two positions must be equal. */
- if (Z == Z_BYTE)
- {
- register int i = m->bytepos;
-
-#if 0
- if (i > GPT_BYTE + GAP_SIZE)
- i -= GAP_SIZE;
- else if (i > GPT_BYTE)
- i = GPT_BYTE;
-#endif
-
- if (m->charpos != i)
- abort ();
- }
-
marker = m->chain;
}
abort ();
}
\f
+/* Adjust markers for a replacement of a text at FROM (FROM_BYTE) of
+ length OLD_CHARS (OLD_BYTES) to a new text of length NEW_CHARS
+ (NEW_BYTES). It is assumed that OLD_CHARS > 0, i.e., this is not
+ an insertion. */
+
+static void
+adjust_markers_for_replace (from, from_byte, old_chars, old_bytes,
+ new_chars, new_bytes)
+ int from, from_byte, old_chars, old_bytes, new_chars, new_bytes;
+{
+ Lisp_Object marker = BUF_MARKERS (current_buffer);
+ int prev_to_byte = from_byte + old_bytes;
+ int diff_chars = new_chars - old_chars;
+ int diff_bytes = new_bytes - old_bytes;
+
+ while (!NILP (marker))
+ {
+ register struct Lisp_Marker *m = XMARKER (marker);
+
+ if (m->bytepos >= prev_to_byte)
+ {
+ m->charpos += diff_chars;
+ m->bytepos += diff_bytes;
+ }
+ else if (m->bytepos > from_byte)
+ {
+ m->charpos = from;
+ m->bytepos = from_byte;
+ }
+
+ marker = m->chain;
+ }
+
+ CHECK_MARKERS ();
+}
+
+\f
/* Make the gap NBYTES_ADDED bytes longer. */
void
make_gap (nbytes_added)
int nbytes_added;
{
- unsigned char *result;
Lisp_Object tem;
int real_gap_loc;
int real_gap_loc_byte;
>= ((unsigned) 1 << (min (BITS_PER_INT, VALBITS) - 1)))
error ("Buffer exceeds maximum size");
- BLOCK_INPUT;
- /* We allocate extra 1-byte `\0' at the tail for anchoring a search. */
- result = BUFFER_REALLOC (BEG_ADDR, (Z_BYTE - BEG_BYTE
- + GAP_SIZE + nbytes_added + 1));
-
- if (result == 0)
- {
- UNBLOCK_INPUT;
- memory_full ();
- }
-
- /* We can't unblock until the new address is properly stored. */
- BEG_ADDR = result;
- UNBLOCK_INPUT;
+ enlarge_buffer_text (current_buffer, nbytes_added);
/* Prevent quitting in move_gap. */
tem = Vinhibit_quit;
{
int nchars = 0;
int bytes_left = nbytes;
+ Lisp_Object tbl = Qnil;
+
+ /* We set the variable tbl to the reverse table of
+ Vnonascii_translation_table in advance. */
+ if (CHAR_TABLE_P (Vnonascii_translation_table))
+ {
+ tbl = Fchar_table_extra_slot (Vnonascii_translation_table,
+ make_number (0));
+ if (!CHAR_TABLE_P (tbl))
+ tbl = Qnil;
+ }
/* Convert multibyte to single byte. */
while (bytes_left > 0)
{
int thislen, c;
c = STRING_CHAR_AND_LENGTH (from_addr, bytes_left, thislen);
- *to_addr++ = (c & 0177) + 0200;
+ if (!SINGLE_BYTE_CHAR_P (c))
+ c = multibyte_char_to_unibyte (c, tbl);
+ *to_addr++ = c;
from_addr += thislen;
- bytes_left--;
+ bytes_left -= thislen;
nchars++;
}
return nchars;
while (nbytes > 0)
{
int c = *from_addr++;
- unsigned char workbuf[4], *str;
- int len;
- if (c >= 0200 && c < 0400)
+ if (c >= 0200)
{
- if (nonascii_insert_offset > 0)
- c += nonascii_insert_offset;
- else
- c += DEFAULT_NONASCII_INSERT_OFFSET;
-
- len = CHAR_STRING (c, workbuf, str);
- bcopy (str, to_addr, len);
- to_addr += len;
+ c = unibyte_char_to_multibyte (c);
+ to_addr += CHAR_STRING (c, to_addr);
nbytes--;
}
else
for (i = 0; i < nbytes; i++)
{
unsigned int c = *ptr++;
- if (c >= 0200 && c < 0400)
+
+ if (c < 0200)
+ outgoing_nbytes++;
+ else
{
- if (nonascii_insert_offset > 0)
- c += nonascii_insert_offset;
- else
- c += DEFAULT_NONASCII_INSERT_OFFSET;
+ c = unibyte_char_to_multibyte (c);
+ outgoing_nbytes += CHAR_BYTES (c);
}
- outgoing_nbytes += XINT (Fchar_bytes (make_number (c)));
}
return outgoing_nbytes;
void
insert (string, nbytes)
register unsigned char *string;
- register nbytes;
+ register int nbytes;
{
if (nbytes > 0)
{
int opoint = PT;
insert_1 (string, nbytes, 0, 1, 0);
signal_after_change (opoint, 0, PT - opoint);
+ update_compositions (opoint, PT, CHECK_BORDER);
}
}
void
insert_and_inherit (string, nbytes)
register unsigned char *string;
- register nbytes;
+ register int nbytes;
{
if (nbytes > 0)
{
int opoint = PT;
insert_1 (string, nbytes, 1, 1, 0);
signal_after_change (opoint, 0, PT - opoint);
+ update_compositions (opoint, PT, CHECK_BORDER);
}
}
insert_char (c)
int c;
{
- unsigned char workbuf[4], *str;
+ unsigned char str[MAX_MULTIBYTE_LENGTH];
int len;
if (! NILP (current_buffer->enable_multibyte_characters))
- len = CHAR_STRING (c, workbuf, str);
+ len = CHAR_STRING (c, str);
else
{
len = 1;
- workbuf[0] = c;
- str = workbuf;
+ str[0] = c;
}
insert (str, len);
insert_1 (string, nbytes, 0, 1, 1);
signal_after_change (opoint, 0, PT - opoint);
+ update_compositions (opoint, PT, CHECK_BORDER);
}
}
insert_1 (string, nbytes, 1, 1, 1);
signal_after_change (opoint, 0, PT - opoint);
+ update_compositions (opoint, PT, CHECK_BORDER);
}
}
-\f
+
/* Subroutine used by the insert functions above. */
void
register int nbytes;
int inherit, prepare, before_markers;
{
- register Lisp_Object temp;
- int nchars = chars_in_text (string, nbytes);
+ insert_1_both (string, chars_in_text (string, nbytes), nbytes,
+ inherit, prepare, before_markers);
+}
- if (prepare)
- prepare_to_modify_buffer (PT, PT, NULL);
+\f
+#ifdef BYTE_COMBINING_DEBUG
- if (PT != GPT)
- move_gap_both (PT, PT_BYTE);
- if (GAP_SIZE < nbytes)
- make_gap (nbytes - GAP_SIZE);
+/* See if the bytes before POS/POS_BYTE combine with bytes
+ at the start of STRING to form a single character.
+ If so, return the number of bytes at the start of STRING
+ which combine in this way. Otherwise, return 0. */
- record_insert (PT, nchars);
- MODIFF++;
+int
+count_combining_before (string, length, pos, pos_byte)
+ unsigned char *string;
+ int length;
+ int pos, pos_byte;
+{
+ int len, combining_bytes;
+ unsigned char *p;
- bcopy (string, GPT_ADDR, nbytes);
+ if (NILP (current_buffer->enable_multibyte_characters))
+ return 0;
+
+ /* At first, we can exclude the following cases:
+ (1) STRING[0] can't be a following byte of multibyte sequence.
+ (2) POS is the start of the current buffer.
+ (3) A character before POS is not a multibyte character. */
+ if (length == 0 || CHAR_HEAD_P (*string)) /* case (1) */
+ return 0;
+ if (pos_byte == BEG_BYTE) /* case (2) */
+ return 0;
+ len = 1;
+ p = BYTE_POS_ADDR (pos_byte - 1);
+ while (! CHAR_HEAD_P (*p)) p--, len++;
+ if (! BASE_LEADING_CODE_P (*p)) /* case (3) */
+ return 0;
+
+ combining_bytes = BYTES_BY_CHAR_HEAD (*p) - len;
+ if (combining_bytes <= 0)
+ /* The character preceding POS is, complete and no room for
+ combining bytes (combining_bytes == 0), or an independent 8-bit
+ character (combining_bytes < 0). */
+ return 0;
+
+ /* We have a combination situation. Count the bytes at STRING that
+ may combine. */
+ p = string + 1;
+ while (!CHAR_HEAD_P (*p) && p < string + length)
+ p++;
+
+ return (combining_bytes < p - string ? combining_bytes : p - string);
+}
-#ifdef USE_TEXT_PROPERTIES
- if (BUF_INTERVALS (current_buffer) != 0)
- /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES. */
- offset_intervals (current_buffer, PT, nchars);
-#endif
+/* See if the bytes after POS/POS_BYTE combine with bytes
+ at the end of STRING to form a single character.
+ If so, return the number of bytes after POS/POS_BYTE
+ which combine in this way. Otherwise, return 0. */
- GAP_SIZE -= nbytes;
- GPT += nchars;
- ZV += nchars;
- Z += nchars;
- GPT_BYTE += nbytes;
- ZV_BYTE += nbytes;
- Z_BYTE += nbytes;
- if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
- adjust_overlays_for_insert (PT, nchars);
- adjust_markers_for_insert (PT, PT_BYTE, PT + nchars, PT_BYTE + nbytes,
- before_markers);
- adjust_point (nchars, nbytes);
+int
+count_combining_after (string, length, pos, pos_byte)
+ unsigned char *string;
+ int length;
+ int pos, pos_byte;
+{
+ int opos_byte = pos_byte;
+ int i;
+ int bytes;
+ unsigned char *bufp;
- if (GPT_BYTE < GPT)
- abort ();
+ if (NILP (current_buffer->enable_multibyte_characters))
+ return 0;
+
+ /* At first, we can exclude the following cases:
+ (1) The last byte of STRING is an ASCII.
+ (2) POS is the last of the current buffer.
+ (3) A character at POS can't be a following byte of multibyte
+ character. */
+ if (length > 0 && ASCII_BYTE_P (string[length - 1])) /* case (1) */
+ return 0;
+ if (pos_byte == Z_BYTE) /* case (2) */
+ return 0;
+ bufp = BYTE_POS_ADDR (pos_byte);
+ if (CHAR_HEAD_P (*bufp)) /* case (3) */
+ return 0;
+
+ i = length - 1;
+ while (i >= 0 && ! CHAR_HEAD_P (string[i]))
+ {
+ i--;
+ }
+ if (i < 0)
+ {
+ /* All characters in STRING are not character head. We must
+ check also preceding bytes at POS. We are sure that the gap
+ is at POS. */
+ unsigned char *p = BEG_ADDR;
+ i = pos_byte - 2;
+ while (i >= 0 && ! CHAR_HEAD_P (p[i]))
+ i--;
+ if (i < 0 || !BASE_LEADING_CODE_P (p[i]))
+ return 0;
+
+ bytes = BYTES_BY_CHAR_HEAD (p[i]);
+ return (bytes <= pos_byte - 1 - i + length
+ ? 0
+ : bytes - (pos_byte - 1 - i + length));
+ }
+ if (!BASE_LEADING_CODE_P (string[i]))
+ return 0;
-#ifdef USE_TEXT_PROPERTIES
- if (!inherit && BUF_INTERVALS (current_buffer) != 0)
- Fset_text_properties (make_number (PT - nchars), make_number (PT),
- Qnil, Qnil);
-#endif
+ bytes = BYTES_BY_CHAR_HEAD (string[i]) - (length - i);
+ bufp++, pos_byte++;
+ while (!CHAR_HEAD_P (*bufp)) bufp++, pos_byte++;
+
+ return (bytes <= pos_byte - opos_byte ? bytes : pos_byte - opos_byte);
}
+#endif
+
+\f
/* Insert a sequence of NCHARS chars which occupy NBYTES bytes
starting at STRING. INHERIT, PREPARE and BEFORE_MARKERS
are the same as in insert_1. */
register int nchars, nbytes;
int inherit, prepare, before_markers;
{
- register Lisp_Object temp;
+ if (NILP (current_buffer->enable_multibyte_characters))
+ nchars = nbytes;
if (prepare)
+ /* Do this before moving and increasing the gap,
+ because the before-change hooks might move the gap
+ or make it smaller. */
prepare_to_modify_buffer (PT, PT, NULL);
if (PT != GPT)
if (GAP_SIZE < nbytes)
make_gap (nbytes - GAP_SIZE);
+#ifdef BYTE_COMBINING_DEBUG
+ if (count_combining_before (string, nbytes, PT, PT_BYTE)
+ || count_combining_after (string, nbytes, PT, PT_BYTE))
+ abort ();
+#endif
+
+ /* Record deletion of the surrounding text that combines with
+ the insertion. This, together with recording the insertion,
+ will add up to the right stuff in the undo list. */
record_insert (PT, nchars);
MODIFF++;
bcopy (string, GPT_ADDR, nbytes);
-#ifdef USE_TEXT_PROPERTIES
- if (BUF_INTERVALS (current_buffer) != 0)
- /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES. */
- offset_intervals (current_buffer, PT, nchars);
-#endif
-
GAP_SIZE -= nbytes;
GPT += nchars;
ZV += nchars;
ZV_BYTE += nbytes;
Z_BYTE += nbytes;
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
- adjust_overlays_for_insert (PT, nchars);
- adjust_markers_for_insert (PT, PT_BYTE, PT + nchars, PT_BYTE + nbytes,
- before_markers);
- adjust_point (nchars, nbytes);
if (GPT_BYTE < GPT)
abort ();
-#ifdef USE_TEXT_PROPERTIES
+ adjust_overlays_for_insert (PT, nchars);
+ adjust_markers_for_insert (PT, PT_BYTE,
+ PT + nchars, PT_BYTE + nbytes,
+ before_markers);
+
+ if (BUF_INTERVALS (current_buffer) != 0)
+ offset_intervals (current_buffer, PT, nchars);
+
if (!inherit && BUF_INTERVALS (current_buffer) != 0)
- Fset_text_properties (make_number (PT - nchars), make_number (PT),
- Qnil, Qnil);
-#endif
+ set_text_properties (make_number (PT), make_number (PT + nchars),
+ Qnil, Qnil, Qnil);
+
+ adjust_point (nchars, nbytes);
+
+ CHECK_MARKERS ();
}
\f
/* Insert the part of the text of STRING, a Lisp object assumed to be
register int pos, pos_byte, length, length_byte;
int inherit;
{
- if (length > 0)
- {
- int opoint = PT;
- insert_from_string_1 (string, pos, pos_byte, length, length_byte,
- inherit, 0);
- signal_after_change (opoint, 0, PT - opoint);
- }
+ int opoint = PT;
+ insert_from_string_1 (string, pos, pos_byte, length, length_byte,
+ inherit, 0);
+ signal_after_change (opoint, 0, PT - opoint);
+ update_compositions (opoint, PT, CHECK_BORDER);
}
/* Like `insert_from_string' except that all markers pointing
register int pos, pos_byte, length, length_byte;
int inherit;
{
- if (length > 0)
- {
- int opoint = PT;
- insert_from_string_1 (string, pos, pos_byte, length, length_byte,
- inherit, 1);
- signal_after_change (opoint, 0, PT - opoint);
- }
+ int opoint = PT;
+ insert_from_string_1 (string, pos, pos_byte, length, length_byte,
+ inherit, 1);
+ signal_after_change (opoint, 0, PT - opoint);
+ update_compositions (opoint, PT, CHECK_BORDER);
}
/* Subroutine of the insertion functions above. */
register int pos, pos_byte, nchars, nbytes;
int inherit, before_markers;
{
- register Lisp_Object temp;
struct gcpro gcpro1;
int outgoing_nbytes = nbytes;
+ INTERVAL intervals;
/* Make OUTGOING_NBYTES describe the text
as it will be inserted in this buffer. */
if (NILP (current_buffer->enable_multibyte_characters))
outgoing_nbytes = nchars;
- else if (nchars == nbytes)
+ else if (! STRING_MULTIBYTE (string))
outgoing_nbytes
= count_size_as_multibyte (&XSTRING (string)->data[pos_byte],
nbytes);
- /* Make sure point-max won't overflow after this insertion. */
- XSETINT (temp, outgoing_nbytes + Z);
- if (outgoing_nbytes + Z != XINT (temp))
- error ("Maximum buffer size exceeded");
-
GCPRO1 (string);
+ /* Do this before moving and increasing the gap,
+ because the before-change hooks might move the gap
+ or make it smaller. */
prepare_to_modify_buffer (PT, PT, NULL);
if (PT != GPT)
move_gap_both (PT, PT_BYTE);
- if (GAP_SIZE < nbytes)
+ if (GAP_SIZE < outgoing_nbytes)
make_gap (outgoing_nbytes - GAP_SIZE);
-
- record_insert (PT, nchars);
- MODIFF++;
UNGCPRO;
/* Copy the string text into the buffer, perhaps converting
between single-byte and multibyte. */
copy_text (XSTRING (string)->data + pos_byte, GPT_ADDR, nbytes,
- /* If these are equal, it is a single-byte string.
- Its chars are either ASCII, in which case copy_text
- won't change it, or single-byte non-ASCII chars,
- that need to be changed. */
- nchars != nbytes,
+ STRING_MULTIBYTE (string),
! NILP (current_buffer->enable_multibyte_characters));
- /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
- offset_intervals (current_buffer, PT, nchars);
+#ifdef BYTE_COMBINING_DEBUG
+ /* We have copied text into the gap, but we have not altered
+ PT or PT_BYTE yet. So we can pass PT and PT_BYTE
+ to these functions and get the same results as we would
+ have got earlier on. Meanwhile, PT_ADDR does point to
+ the text that has been stored by copy_text. */
+ if (count_combining_before (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE)
+ || count_combining_after (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE))
+ abort ();
+#endif
+
+ record_insert (PT, nchars);
+ MODIFF++;
GAP_SIZE -= outgoing_nbytes;
GPT += nchars;
ZV_BYTE += outgoing_nbytes;
Z_BYTE += outgoing_nbytes;
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
+
+ if (GPT_BYTE < GPT)
+ abort ();
+
adjust_overlays_for_insert (PT, nchars);
adjust_markers_for_insert (PT, PT_BYTE, PT + nchars,
PT_BYTE + outgoing_nbytes,
before_markers);
- if (GPT_BYTE < GPT)
- abort ();
+ offset_intervals (current_buffer, PT, nchars);
- graft_intervals_into_buffer (XSTRING (string)->intervals, PT, nchars,
+ intervals = XSTRING (string)->intervals;
+ /* Get the intervals for the part of the string we are inserting. */
+ if (nbytes < STRING_BYTES (XSTRING (string)))
+ intervals = copy_intervals (intervals, pos, nchars);
+
+ /* Insert those intervals. */
+ graft_intervals_into_buffer (intervals, PT, nchars,
current_buffer, inherit);
adjust_point (nchars, outgoing_nbytes);
int charpos, nchars;
int inherit;
{
- if (nchars > 0)
- {
- int opoint = PT;
+ int opoint = PT;
- insert_from_buffer_1 (buf, charpos, nchars, inherit);
- signal_after_change (opoint, 0, PT - opoint);
- }
+ insert_from_buffer_1 (buf, charpos, nchars, inherit);
+ signal_after_change (opoint, 0, PT - opoint);
+ update_compositions (opoint, PT, CHECK_BORDER);
}
static void
int inherit;
{
register Lisp_Object temp;
- int chunk;
+ int chunk, chunk_expanded;
int from_byte = buf_charpos_to_bytepos (buf, from);
int to_byte = buf_charpos_to_bytepos (buf, from + nchars);
int incoming_nbytes = to_byte - from_byte;
int outgoing_nbytes = incoming_nbytes;
+ INTERVAL intervals;
/* Make OUTGOING_NBYTES describe the text
as it will be inserted in this buffer. */
if (NILP (current_buffer->enable_multibyte_characters))
outgoing_nbytes = nchars;
else if (NILP (buf->enable_multibyte_characters))
- outgoing_nbytes
- = count_size_as_multibyte (BUF_BYTE_ADDRESS (buf, from_byte),
- incoming_nbytes);
+ {
+ int outgoing_before_gap = 0;
+ int outgoing_after_gap = 0;
+ if (from < BUF_GPT (buf))
+ {
+ chunk = BUF_GPT_BYTE (buf) - from_byte;
+ if (chunk > incoming_nbytes)
+ chunk = incoming_nbytes;
+ outgoing_before_gap
+ = count_size_as_multibyte (BUF_BYTE_ADDRESS (buf, from_byte),
+ chunk);
+ }
+ else
+ chunk = 0;
+
+ if (chunk < incoming_nbytes)
+ outgoing_after_gap
+ = count_size_as_multibyte (BUF_BYTE_ADDRESS (buf,
+ from_byte + chunk),
+ incoming_nbytes - chunk);
+
+ outgoing_nbytes = outgoing_before_gap + outgoing_after_gap;
+ }
+
/* Make sure point-max won't overflow after this insertion. */
XSETINT (temp, outgoing_nbytes + Z);
if (outgoing_nbytes + Z != XINT (temp))
error ("Maximum buffer size exceeded");
+ /* Do this before moving and increasing the gap,
+ because the before-change hooks might move the gap
+ or make it smaller. */
prepare_to_modify_buffer (PT, PT, NULL);
if (PT != GPT)
if (GAP_SIZE < outgoing_nbytes)
make_gap (outgoing_nbytes - GAP_SIZE);
- record_insert (PT, nchars);
- MODIFF++;
-
if (from < BUF_GPT (buf))
{
chunk = BUF_GPT_BYTE (buf) - from_byte;
if (chunk > incoming_nbytes)
chunk = incoming_nbytes;
- copy_text (BUF_BYTE_ADDRESS (buf, from_byte),
- GPT_ADDR, chunk,
- ! NILP (buf->enable_multibyte_characters),
- ! NILP (current_buffer->enable_multibyte_characters));
+ /* Record number of output bytes, so we know where
+ to put the output from the second copy_text. */
+ chunk_expanded
+ = copy_text (BUF_BYTE_ADDRESS (buf, from_byte),
+ GPT_ADDR, chunk,
+ ! NILP (buf->enable_multibyte_characters),
+ ! NILP (current_buffer->enable_multibyte_characters));
}
else
- chunk = 0;
+ chunk_expanded = chunk = 0;
+
if (chunk < incoming_nbytes)
copy_text (BUF_BYTE_ADDRESS (buf, from_byte + chunk),
- GPT_ADDR + chunk, incoming_nbytes - chunk,
+ GPT_ADDR + chunk_expanded, incoming_nbytes - chunk,
! NILP (buf->enable_multibyte_characters),
! NILP (current_buffer->enable_multibyte_characters));
-#ifdef USE_TEXT_PROPERTIES
- if (BUF_INTERVALS (current_buffer) != 0)
- offset_intervals (current_buffer, PT, nchars);
+#ifdef BYTE_COMBINING_DEBUG
+ /* We have copied text into the gap, but we have not altered
+ PT or PT_BYTE yet. So we can pass PT and PT_BYTE
+ to these functions and get the same results as we would
+ have got earlier on. Meanwhile, GPT_ADDR does point to
+ the text that has been stored by copy_text. */
+ if (count_combining_before (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE)
+ || count_combining_after (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE))
+ abort ();
#endif
+ record_insert (PT, nchars);
+ MODIFF++;
+
GAP_SIZE -= outgoing_nbytes;
GPT += nchars;
ZV += nchars;
ZV_BYTE += outgoing_nbytes;
Z_BYTE += outgoing_nbytes;
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
+
+ if (GPT_BYTE < GPT)
+ abort ();
+
adjust_overlays_for_insert (PT, nchars);
adjust_markers_for_insert (PT, PT_BYTE, PT + nchars,
- PT_BYTE + outgoing_nbytes, 0);
+ PT_BYTE + outgoing_nbytes,
+ 0);
+
+ if (BUF_INTERVALS (current_buffer) != 0)
+ offset_intervals (current_buffer, PT, nchars);
+
+ /* Get the intervals for the part of the string we are inserting. */
+ intervals = BUF_INTERVALS (buf);
+ if (outgoing_nbytes < BUF_Z_BYTE (buf) - BUF_BEG_BYTE (buf))
+ {
+ if (buf == current_buffer && PT <= from)
+ from += nchars;
+ intervals = copy_intervals (intervals, from, nchars);
+ }
+
+ /* Insert those intervals. */
+ graft_intervals_into_buffer (intervals, PT, nchars, current_buffer, inherit);
+
adjust_point (nchars, outgoing_nbytes);
+}
+\f
+/* Record undo information and adjust markers and position keepers for
+ a replacement of a text PREV_TEXT at FROM to a new text of LEN
+ chars (LEN_BYTE bytes) which resides in the gap just after
+ GPT_ADDR.
- if (GPT_BYTE < GPT)
+ PREV_TEXT nil means the new text was just inserted. */
+
+void
+adjust_after_replace (from, from_byte, prev_text, len, len_byte)
+ int from, from_byte, len, len_byte;
+ Lisp_Object prev_text;
+{
+ int nchars_del = 0, nbytes_del = 0;
+
+#ifdef BYTE_COMBINING_DEBUG
+ if (count_combining_before (GPT_ADDR, len_byte, from, from_byte)
+ || count_combining_after (GPT_ADDR, len_byte, from, from_byte))
abort ();
+#endif
- /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
- graft_intervals_into_buffer (copy_intervals (BUF_INTERVALS (buf),
- from, nchars),
- PT - nchars, nchars,
- current_buffer, inherit);
+ if (STRINGP (prev_text))
+ {
+ nchars_del = XSTRING (prev_text)->size;
+ nbytes_del = STRING_BYTES (XSTRING (prev_text));
+ }
+
+ /* Update various buffer positions for the new text. */
+ GAP_SIZE -= len_byte;
+ ZV += len; Z+= len;
+ ZV_BYTE += len_byte; Z_BYTE += len_byte;
+ GPT += len; GPT_BYTE += len_byte;
+ if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
+
+ if (nchars_del > 0)
+ adjust_markers_for_replace (from, from_byte, nchars_del, nbytes_del,
+ len, len_byte);
+ else
+ adjust_markers_for_insert (from, from_byte,
+ from + len, from_byte + len_byte, 0);
+
+ if (! EQ (current_buffer->undo_list, Qt))
+ {
+ if (nchars_del > 0)
+ record_delete (from, prev_text);
+ record_insert (from, len);
+ }
+
+ if (len > nchars_del)
+ adjust_overlays_for_insert (from, len - nchars_del);
+ else if (len < nchars_del)
+ adjust_overlays_for_delete (from, nchars_del - len);
+ if (BUF_INTERVALS (current_buffer) != 0)
+ {
+ offset_intervals (current_buffer, from, len - nchars_del);
+ }
+
+ if (from < PT)
+ adjust_point (len - nchars_del, len_byte - nbytes_del);
+
+ /* As byte combining will decrease Z, we must check this again. */
+ if (Z - GPT < END_UNCHANGED)
+ END_UNCHANGED = Z - GPT;
+
+ CHECK_MARKERS ();
+
+ if (len == 0)
+ evaporate_overlays (from);
+ MODIFF++;
}
-\f
+
+/* Record undo information, adjust markers and position keepers for an
+ insertion of a text from FROM (FROM_BYTE) to TO (TO_BYTE). The
+ text already exists in the current buffer but character length (TO
+ - FROM) may be incorrect, the correct length is NEWLEN. */
+
+void
+adjust_after_insert (from, from_byte, to, to_byte, newlen)
+ int from, from_byte, to, to_byte, newlen;
+{
+ int len = to - from, len_byte = to_byte - from_byte;
+
+ if (GPT != to)
+ move_gap_both (to, to_byte);
+ GAP_SIZE += len_byte;
+ GPT -= len; GPT_BYTE -= len_byte;
+ ZV -= len; ZV_BYTE -= len_byte;
+ Z -= len; Z_BYTE -= len_byte;
+ adjust_after_replace (from, from_byte, Qnil, newlen, len_byte);
+}
+
/* Replace the text from character positions FROM to TO with NEW,
If PREPARE is nonzero, call prepare_to_modify_buffer.
If INHERIT, the newly inserted text should inherit text properties
/* Note that this does not yet handle markers quite right.
Also it needs to record a single undo-entry that does a replacement
rather than a separate delete and insert.
- That way, undo will also handle markers properly. */
+ That way, undo will also handle markers properly.
+
+ But if MARKERS is 0, don't relocate markers. */
void
-replace_range (from, to, new, prepare, inherit)
+replace_range (from, to, new, prepare, inherit, markers)
Lisp_Object new;
- int from, to, prepare, inherit;
+ int from, to, prepare, inherit, markers;
{
int inschars = XSTRING (new)->size;
- int insbytes = XSTRING (new)->size_byte;
+ int insbytes = STRING_BYTES (XSTRING (new));
int from_byte, to_byte;
int nbytes_del, nchars_del;
register Lisp_Object temp;
struct gcpro gcpro1;
+ INTERVAL intervals;
+ int outgoing_insbytes = insbytes;
+ Lisp_Object deletion;
+
+ CHECK_MARKERS ();
GCPRO1 (new);
+ deletion = Qnil;
if (prepare)
{
if (nbytes_del <= 0 && insbytes == 0)
return;
+ /* Make OUTGOING_INSBYTES describe the text
+ as it will be inserted in this buffer. */
+
+ if (NILP (current_buffer->enable_multibyte_characters))
+ outgoing_insbytes = inschars;
+ else if (! STRING_MULTIBYTE (new))
+ outgoing_insbytes
+ = count_size_as_multibyte (XSTRING (new)->data, insbytes);
+
/* Make sure point-max won't overflow after this insertion. */
XSETINT (temp, Z_BYTE - nbytes_del + insbytes);
if (Z_BYTE - nbytes_del + insbytes != XINT (temp))
if (to < GPT)
gap_left (to, to_byte, 0);
- /* Relocate all markers pointing into the new, larger gap
- to point at the end of the text before the gap.
- Do this before recording the deletion,
- so that undo handles this after reinserting the text. */
- adjust_markers_for_delete (from, from_byte, to, to_byte);
+ /* Even if we don't record for undo, we must keep the original text
+ because we may have to recover it because of inappropriate byte
+ combining. */
+ if (! EQ (current_buffer->undo_list, Qt))
+ deletion = make_buffer_string_both (from, from_byte, to, to_byte, 1);
- record_delete (from, nchars_del);
+ if (markers)
+ /* Relocate all markers pointing into the new, larger gap
+ to point at the end of the text before the gap.
+ Do this before recording the deletion,
+ so that undo handles this after reinserting the text. */
+ adjust_markers_for_delete (from, from_byte, to, to_byte);
GAP_SIZE += nbytes_del;
ZV -= nchars_del;
if (GPT_BYTE < GPT)
abort ();
- if (GPT - BEG < beg_unchanged)
- beg_unchanged = GPT - BEG;
- if (Z - GPT < end_unchanged)
- end_unchanged = Z - GPT;
+ if (GPT - BEG < BEG_UNCHANGED)
+ BEG_UNCHANGED = GPT - BEG;
+ if (Z - GPT < END_UNCHANGED)
+ END_UNCHANGED = Z - GPT;
if (GAP_SIZE < insbytes)
make_gap (insbytes - GAP_SIZE);
- record_insert (from, inschars);
-
- bcopy (XSTRING (new)->data, GPT_ADDR, insbytes);
-
- /* Relocate point as if it were a marker. */
- if (from < PT)
- adjust_point (from + inschars - (PT < to ? PT : to),
- (from_byte + insbytes
- - (PT_BYTE < to_byte ? PT_BYTE : to_byte)));
+ /* Copy the string text into the buffer, perhaps converting
+ between single-byte and multibyte. */
+ copy_text (XSTRING (new)->data, GPT_ADDR, insbytes,
+ STRING_MULTIBYTE (new),
+ ! NILP (current_buffer->enable_multibyte_characters));
-#ifdef USE_TEXT_PROPERTIES
- offset_intervals (current_buffer, PT, inschars - nchars_del);
+#ifdef BYTE_COMBINING_DEBUG
+ /* We have copied text into the gap, but we have not marked
+ it as part of the buffer. So we can use the old FROM and FROM_BYTE
+ here, for both the previous text and the following text.
+ Meanwhile, GPT_ADDR does point to
+ the text that has been stored by copy_text. */
+ if (count_combining_before (GPT_ADDR, outgoing_insbytes, from, from_byte)
+ || count_combining_after (GPT_ADDR, outgoing_insbytes, from, from_byte))
+ abort ();
#endif
- GAP_SIZE -= insbytes;
+ if (! EQ (current_buffer->undo_list, Qt))
+ {
+ record_delete (from, deletion);
+ record_insert (from, inschars);
+ }
+
+ GAP_SIZE -= outgoing_insbytes;
GPT += inschars;
ZV += inschars;
Z += inschars;
- GPT_BYTE += insbytes;
- ZV_BYTE += insbytes;
- ZV_BYTE += insbytes;
+ GPT_BYTE += outgoing_insbytes;
+ ZV_BYTE += outgoing_insbytes;
+ Z_BYTE += outgoing_insbytes;
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
if (GPT_BYTE < GPT)
adjusting the markers that bound the overlays. */
adjust_overlays_for_delete (from, nchars_del);
adjust_overlays_for_insert (from, inschars);
- adjust_markers_for_insert (from, from_byte, from + inschars,
- from_byte + insbytes, 0);
+ if (markers)
+ adjust_markers_for_insert (from, from_byte,
+ from + inschars, from_byte + outgoing_insbytes,
+ 0);
+
+ offset_intervals (current_buffer, from, inschars - nchars_del);
+
+ /* Get the intervals for the part of the string we are inserting--
+ not including the combined-before bytes. */
+ intervals = XSTRING (new)->intervals;
+ /* Insert those intervals. */
+ graft_intervals_into_buffer (intervals, from, inschars,
+ current_buffer, inherit);
-#ifdef USE_TEXT_PROPERTIES
- /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
- graft_intervals_into_buffer (XSTRING (new)->intervals, from,
- inschars, current_buffer, inherit);
-#endif
+ /* Relocate point as if it were a marker. */
+ if (from < PT)
+ adjust_point ((from + inschars - (PT < to ? PT : to)),
+ (from_byte + outgoing_insbytes
+ - (PT_BYTE < to_byte ? PT_BYTE : to_byte)));
- if (insbytes == 0)
+ if (outgoing_insbytes == 0)
evaporate_overlays (from);
+ CHECK_MARKERS ();
+
MODIFF++;
UNGCPRO;
- signal_after_change (from, nchars_del, inschars);
+ signal_after_change (from, nchars_del, GPT - from);
+ update_compositions (from, GPT, CHECK_BORDER);
}
\f
/* Delete characters in current buffer
del_range (from, to)
register int from, to;
{
- del_range_1 (from, to, 1);
+ del_range_1 (from, to, 1, 0);
}
-/* Like del_range; PREPARE says whether to call prepare_to_modify_buffer. */
+/* Like del_range; PREPARE says whether to call prepare_to_modify_buffer.
+ RET_STRING says to return the deleted text. */
-void
-del_range_1 (from, to, prepare)
- int from, to, prepare;
+Lisp_Object
+del_range_1 (from, to, prepare, ret_string)
+ int from, to, prepare, ret_string;
{
int from_byte, to_byte;
+ Lisp_Object deletion;
+ struct gcpro gcpro1;
/* Make args be valid */
if (from < BEGV)
to = ZV;
if (to <= from)
- return;
+ return Qnil;
if (prepare)
{
from_byte = CHAR_TO_BYTE (from);
to_byte = CHAR_TO_BYTE (to);
- del_range_2 (from, to, from_byte, to_byte);
+ deletion = del_range_2 (from, from_byte, to, to_byte, ret_string);
+ GCPRO1(deletion);
+ signal_after_change (from, to - from, 0);
+ update_compositions (from, from, CHECK_HEAD);
+ UNGCPRO;
+ return deletion;
}
/* Like del_range_1 but args are byte positions, not char positions. */
to_byte = CHAR_TO_BYTE (to);
}
- del_range_2 (from, to, from_byte, to_byte);
+ del_range_2 (from, from_byte, to, to_byte, 0);
+ signal_after_change (from, to - from, 0);
+ update_compositions (from, from, CHECK_HEAD);
}
/* Like del_range_1, but positions are specified both as charpos
and bytepos. */
void
-del_range_both (from, to, from_byte, to_byte, prepare)
- int from, to, from_byte, to_byte, prepare;
+del_range_both (from, from_byte, to, to_byte, prepare)
+ int from, from_byte, to, to_byte, prepare;
{
/* Make args be valid */
if (from_byte < BEGV_BYTE)
to_byte = CHAR_TO_BYTE (to);
}
- del_range_2 (from, to, from_byte, to_byte);
+ del_range_2 (from, from_byte, to, to_byte, 0);
+ signal_after_change (from, to - from, 0);
+ update_compositions (from, from, CHECK_HEAD);
}
/* Delete a range of text, specified both as character positions
and byte positions. FROM and TO are character positions,
- while FROM_BYTE and TO_BYTE are byte positions. */
+ while FROM_BYTE and TO_BYTE are byte positions.
+ If RET_STRING is true, the deleted area is returned as a string. */
-void
-del_range_2 (from, to, from_byte, to_byte)
- int from, to, from_byte, to_byte;
+Lisp_Object
+del_range_2 (from, from_byte, to, to_byte, ret_string)
+ int from, from_byte, to, to_byte, ret_string;
{
register int nbytes_del, nchars_del;
+ Lisp_Object deletion;
+
+ CHECK_MARKERS ();
nchars_del = to - from;
nbytes_del = to_byte - from_byte;
if (to < GPT)
gap_left (to, to_byte, 0);
+#ifdef BYTE_COMBINING_DEBUG
+ if (count_combining_before (BUF_BYTE_ADDRESS (current_buffer, to_byte),
+ Z_BYTE - to_byte, from, from_byte))
+ abort ();
+#endif
+
+ if (ret_string || ! EQ (current_buffer->undo_list, Qt))
+ deletion = make_buffer_string_both (from, from_byte, to, to_byte, 1);
+ else
+ deletion = Qnil;
+
/* Relocate all markers pointing into the new, larger gap
to point at the end of the text before the gap.
Do this before recording the deletion,
so that undo handles this after reinserting the text. */
adjust_markers_for_delete (from, from_byte, to, to_byte);
- record_delete (from, nchars_del);
+ if (! EQ (current_buffer->undo_list, Qt))
+ record_delete (from, deletion);
MODIFF++;
/* Relocate point as if it were a marker. */
adjust_point (from - (PT < to ? PT : to),
from_byte - (PT_BYTE < to_byte ? PT_BYTE : to_byte));
- /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
offset_intervals (current_buffer, from, - nchars_del);
/* Adjust the overlay center as needed. This must be done after
adjusting the markers that bound the overlays. */
- adjust_overlays_for_delete (from_byte, nchars_del);
+ adjust_overlays_for_delete (from, nchars_del);
GAP_SIZE += nbytes_del;
ZV_BYTE -= nbytes_del;
if (GPT_BYTE < GPT)
abort ();
- if (GPT - BEG < beg_unchanged)
- beg_unchanged = GPT - BEG;
- if (Z - GPT < end_unchanged)
- end_unchanged = Z - GPT;
+ if (GPT - BEG < BEG_UNCHANGED)
+ BEG_UNCHANGED = GPT - BEG;
+ if (Z - GPT < END_UNCHANGED)
+ END_UNCHANGED = Z - GPT;
+
+ CHECK_MARKERS ();
evaporate_overlays (from);
- signal_after_change (from, nchars_del, 0);
+
+ return deletion;
}
\f
/* Call this if you're about to change the region of BUFFER from
prepare_to_modify_buffer (start, end, NULL);
- if (start - 1 < beg_unchanged
- || (unchanged_modified == MODIFF
- && overlay_unchanged_modified == OVERLAY_MODIFF))
- beg_unchanged = start - 1;
- if (Z - end < end_unchanged
- || (unchanged_modified == MODIFF
- && overlay_unchanged_modified == OVERLAY_MODIFF))
- end_unchanged = Z - end;
+ BUF_COMPUTE_UNCHANGED (buffer, start - 1, end);
if (MODIFF <= SAVE_MODIFF)
record_first_change ();
if (!NILP (current_buffer->read_only))
Fbarf_if_buffer_read_only ();
- /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
+ /* Let redisplay consider other windows than selected_window
+ if modifying another buffer. */
+ if (XBUFFER (XWINDOW (selected_window)->buffer) != current_buffer)
+ ++windows_or_buffers_changed;
+
if (BUF_INTERVALS (current_buffer) != 0)
{
if (preserve_ptr)
Lisp_Object preserve_marker;
struct gcpro gcpro1, gcpro2, gcpro3;
+ if (inhibit_modification_hooks)
+ return;
+
start = make_number (start_int);
end = make_number (end_int);
preserve_marker = Qnil;
call1 (Vrun_hooks, Qfirst_change_hook);
}
- /* 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. */
- if (!NILP (Vbefore_change_function))
- {
- PRESERVE_VALUE;
- PRESERVE_START_END;
- call2 (Vbefore_change_function, FETCH_START, FETCH_END);
- }
-
/* Now run the before-change-functions if any. */
if (!NILP (Vbefore_change_functions))
{
signal_after_change (charpos, lendel, lenins)
int charpos, lendel, lenins;
{
+ if (inhibit_modification_hooks)
+ return;
+
/* 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 (Vbefore_change_functions)
&& NILP (current_buffer->overlays_before)
&& NILP (current_buffer->overlays_after))
{
if (!NILP (combine_after_change_list))
Fcombine_after_change_execute ();
- /* 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. */
- if (!NILP (Vafter_change_function))
- call3 (Vafter_change_function,
- make_number (charpos), make_number (charpos + lenins),
- make_number (lendel));
-
if (!NILP (Vafter_change_functions))
{
Lisp_Object args[4];
/* After an insertion, call the text properties
insert-behind-hooks or insert-in-front-hooks. */
if (lendel == 0)
- report_interval_modification (charpos, charpos + lenins);
+ report_interval_modification (make_number (charpos),
+ make_number (charpos + lenins));
}
Lisp_Object
"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;
+ if (NILP (combine_after_change_list))
+ return Qnil;
+
record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
Fset_buffer (combine_after_change_buffer);
/* 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)
+ tail = XCDR (tail))
{
Lisp_Object elt;
int thisbeg, thisend, thischange;
/* Extract the info from the next element. */
- elt = XCONS (tail)->car;
+ elt = XCAR (tail);
if (! CONSP (elt))
continue;
- thisbeg = XINT (XCONS (elt)->car);
+ thisbeg = XINT (XCAR (elt));
- elt = XCONS (elt)->cdr;
+ elt = XCDR (elt);
if (! CONSP (elt))
continue;
- thisend = XINT (XCONS (elt)->car);
+ thisend = XINT (XCAR (elt));
- elt = XCONS (elt)->cdr;
+ elt = XCDR (elt);
if (! CONSP (elt))
continue;
- thischange = XINT (XCONS (elt)->car);
+ thischange = XINT (XCAR (elt));
/* Merge this range into the accumulated range. */
change += thischange;
record_unwind_protect (Fcombine_after_change_execute_1,
Vcombine_after_change_calls);
signal_after_change (begpos, endpos - begpos - change, endpos - begpos);
+ update_compositions (begpos, endpos, CHECK_ALL);
- return unbind_to (count, val);
+ return unbind_to (count, Qnil);
}
\f
+void
syms_of_insdel ()
{
staticpro (&combine_after_change_list);
combine_after_change_list = Qnil;
+ combine_after_change_buffer = Qnil;
+ DEFVAR_BOOL ("check-markers-debug-flag", &check_markers_debug_flag,
+ "Non-nil means enable debugging checks for invalid marker positions.");
+ check_markers_debug_flag = 0;
DEFVAR_LISP ("combine-after-change-calls", &Vcombine_after_change_calls,
- "Used internally by the `combine-after-change-calls' macro.");
+ "Used internally by the `combine-after-change-calls' macro.");
Vcombine_after_change_calls = Qnil;
+ DEFVAR_BOOL ("inhibit-modification-hooks", &inhibit_modification_hooks,
+ "Non-nil means don't run any of the hooks that respond to buffer changes.\n\
+This affects `before-change-functions' and `after-change-functions',\n\
+as well as hooks attached to text properties and overlays.");
+ inhibit_modification_hooks = 0;
+
defsubr (&Scombine_after_change_execute);
}
HCoop / bpt / emacs.git / blobdiff