static void gap_left P_ ((int, int, int));
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_insert P_ ((int, int, int, int, int, int, int));
static void adjust_markers_for_delete P_ ((int, int, int, int));
+static void adjust_markers_for_record_delete P_ ((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;
-
-#define DEFAULT_NONASCII_INSERT_OFFSET 0x800
\f
/* Move gap to position CHARPOS.
Note that this can quit! */
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->bytepos = from_byte;
}
- /* In a single-byte buffer, a marker's two positions must be equal. */
- if (Z == Z_BYTE)
- {
- register int i = m->bytepos;
+ marker = m->chain;
+ }
+}
+\f
+/* Adjust all markers for calling record_delete for combining bytes.
+ whose range in bytes is FROM_BYTE to TO_BYTE.
+ The range in charpos is FROM to TO. */
-#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
+static void
+adjust_markers_for_record_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;
- if (m->charpos != i)
- abort ();
- }
+ marker = BUF_MARKERS (current_buffer);
+
+ while (!NILP (marker))
+ {
+ m = XMARKER (marker);
+ charpos = m->charpos;
+
+ /* If the marker is after the deletion,
+ relocate by number of chars / bytes deleted. */
+ if (charpos > to)
+ ;
+ /* Here's the case where a marker is inside text being deleted. */
+ else if (charpos > from)
+ record_marker_adjustment (marker, from - charpos);
marker = m->chain;
}
}
\f
-/* Adjust markers for an insertion at CHARPOS / BYTEPOS
- consisting of NCHARS chars, which are NBYTES bytes.
+/* 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).
- We have to relocate the charpos of every marker that points
- after the insertion (but not their bytepos).
+ COMBINED_BEFORE_BYTES is the number of bytes at the start of the insertion
+ that combine into one character with the text before the insertion.
+ COMBINED_AFTER_BYTES is the number of bytes after the insertion
+ that combine into one character with the last inserted bytes.
When a marker points at the insertion point,
we advance it if either its insertion-type is t
or BEFORE_MARKERS is true. */
static void
-adjust_markers_for_insert (from, from_byte, to, to_byte, before_markers)
- register int from, from_byte, to, to_byte, before_markers;
+adjust_markers_for_insert (from, from_byte, to, to_byte,
+ combined_before_bytes, combined_after_bytes,
+ before_markers)
+ register int from, from_byte, to, to_byte;
+ int combined_before_bytes, combined_after_bytes, 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 this insertion is going to combine characters, Z will
+ become different from Z_BYTE, but they might be the same now.
+ If so, the two OLD positions of the marker should 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 += nbytes + combined_after_bytes;
+ m->charpos += nchars + !!combined_after_bytes;
+ /* Point the marker before the combined character,
+ so that undoing the insertion puts it back where it was. */
+ if (combined_after_bytes)
+ DEC_BOTH (m->charpos, m->bytepos);
+ if (m->insertion_type)
+ adjusted = 1;
+ }
+ else if (combined_before_bytes)
+ {
+ /* This marker doesn't "need relocation",
+ but don't leave it pointing in the middle of a character.
+ Point the marker after the combined character,
+ so that undoing the insertion puts it back where it was. */
+
+ /* Here we depend on the fact that the gap is after
+ all of the combining bytes that we are going to skip over. */
+ DEC_BOTH (m->charpos, m->bytepos);
+ INC_BOTH (m->charpos, m->bytepos);
+ }
+ }
+ /* If a marker was pointing into the combining bytes
+ after the insertion, don't leave it there
+ in the middle of a character. */
+ else if (combined_after_bytes && m->bytepos >= from_byte
+ && m->bytepos < from_byte + combined_after_bytes)
+ {
+ /* Put it after the combining bytes. */
+ m->bytepos = to_byte + combined_after_bytes;
+ m->charpos = to + 1;
+ /* Now move it back before the combined character,
+ so that undoing the insertion will put it where it was. */
+ DEC_BOTH (m->charpos, m->bytepos);
}
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;
}
unsigned char workbuf[4], *str;
int len;
- if (c >= 0200 && c < 0400)
+ if (c >= 0240 && c < 0400)
{
- if (nonascii_insert_offset > 0)
- c += nonascii_insert_offset;
- else
- c += DEFAULT_NONASCII_INSERT_OFFSET;
-
+ c = unibyte_char_to_multibyte (c);
len = CHAR_STRING (c, workbuf, str);
bcopy (str, to_addr, len);
to_addr += len;
for (i = 0; i < nbytes; i++)
{
unsigned int c = *ptr++;
- if (c >= 0200 && c < 0400)
+
+ if (c < 0240)
+ 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 += XINT (Fchar_bytes (make_number (c)));
}
- outgoing_nbytes += XINT (Fchar_bytes (make_number (c)));
}
return outgoing_nbytes;
signal_after_change (opoint, 0, PT - opoint);
}
}
-\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);
+}
+\f
+/* 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. */
- if (prepare)
- prepare_to_modify_buffer (PT, PT, NULL);
+int
+count_combining_before (string, length, pos, pos_byte)
+ unsigned char *string;
+ int length;
+ int pos, pos_byte;
+{
+ int opos = pos, opos_byte = pos_byte;
+ int c;
+ unsigned char *p = string;
- if (PT != GPT)
- move_gap_both (PT, PT_BYTE);
- if (GAP_SIZE < nbytes)
- make_gap (nbytes - GAP_SIZE);
+ if (NILP (current_buffer->enable_multibyte_characters))
+ return 0;
+ if (length == 0 || CHAR_HEAD_P (*string))
+ return 0;
+ if (pos == BEGV)
+ return 0;
+ c = FETCH_BYTE (pos_byte - 1);
+ if (ASCII_BYTE_P (c))
+ return 0;
+ DEC_BOTH (pos, pos_byte);
+ c = FETCH_BYTE (pos_byte);
+ if (! BASE_LEADING_CODE_P (c))
+ return 0;
+
+ /* We have a combination situation.
+ Count the bytes at STRING that will combine. */
+ while (!CHAR_HEAD_P (*p) && p < string + length)
+ p++;
+
+ return p - string;
+}
- record_insert (PT, nchars);
- MODIFF++;
+/* 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. */
- bcopy (string, GPT_ADDR, nbytes);
+int
+count_combining_after (string, length, pos, pos_byte)
+ unsigned char *string;
+ int length;
+ int pos, pos_byte;
+{
+ int opos = pos, opos_byte = pos_byte;
+ int i;
+ int c;
-#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
+ if (NILP (current_buffer->enable_multibyte_characters))
+ return 0;
+ if (length == 0 || ASCII_BYTE_P (string[length - 1]))
+ return 0;
+ i = length - 1;
+ while (i > 0 && ! CHAR_HEAD_P (string[i]))
+ {
+ i--;
+ }
+ if (! BASE_LEADING_CODE_P (string[i]))
+ return 0;
+
+ if (pos == ZV)
+ return 0;
+ c = FETCH_BYTE (pos_byte);
+ if (CHAR_HEAD_P (c))
+ return 0;
+ while (pos_byte < ZV_BYTE)
+ {
+ c = FETCH_BYTE (pos_byte);
+ if (CHAR_HEAD_P (c))
+ break;
+ pos_byte++;
+ }
- 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);
+ return pos_byte - opos_byte;
+}
- if (GPT_BYTE < GPT)
- abort ();
+/* Adjust the position TARGET/TARGET_BYTE for the combining of NBYTES
+ following the position POS/POS_BYTE to the character preceding POS.
+ If TARGET is after POS+NBYTES, we only have to adjust the character
+ position TARGET, else, if TARGET is after POS, we have to adjust
+ both the character position TARGET and the byte position
+ TARGET_BYTE, else we don't have to do any adjustment. */
+
+#define ADJUST_CHAR_POS(target, target_byte) \
+ do { \
+ if (target > pos + nbytes) \
+ target -= nbytes; \
+ else if (target >= pos) \
+ { \
+ target = pos; \
+ target_byte = pos_byte + nbytes; \
+ } \
+ } while (0)
+
+/* Combine NBYTES stray trailing-codes, which were formerly separate
+ characters, with the preceding character. These bytes
+ are located after position POS / POS_BYTE, and the preceding character
+ is located just before that position. */
-#ifdef USE_TEXT_PROPERTIES
- if (!inherit && BUF_INTERVALS (current_buffer) != 0)
- Fset_text_properties (make_number (PT - nchars), make_number (PT),
- Qnil, Qnil);
-#endif
-}
+static void
+combine_bytes (pos, pos_byte, nbytes)
+ int pos, pos_byte, nbytes;
+{
+ /* Adjust all markers. */
+ adjust_markers_for_delete (pos, pos_byte, pos + nbytes, pos_byte);
+
+ adjust_overlays_for_delete (pos, nbytes);
+
+ ADJUST_CHAR_POS (BUF_PT (current_buffer), BUF_PT_BYTE (current_buffer));
+ ADJUST_CHAR_POS (GPT, GPT_BYTE);
+ ADJUST_CHAR_POS (Z, Z_BYTE);
+ ADJUST_CHAR_POS (ZV, ZV_BYTE);
+ if (BUF_INTERVALS (current_buffer) != 0)
+ /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES. */
+ offset_intervals (current_buffer, pos, - nbytes);
+}
+\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;
+ register Lisp_Object temp, deletion;
+ int combined_before_bytes, combined_after_bytes;
- if (prepare)
- prepare_to_modify_buffer (PT, PT, NULL);
+ if (NILP (current_buffer->enable_multibyte_characters))
+ nchars = nbytes;
if (PT != GPT)
move_gap_both (PT, PT_BYTE);
if (GAP_SIZE < nbytes)
make_gap (nbytes - GAP_SIZE);
- record_insert (PT, nchars);
+ if (prepare)
+ prepare_to_modify_buffer (PT, PT, NULL);
+
+ combined_before_bytes
+ = count_combining_before (string, nbytes, PT, PT_BYTE);
+ combined_after_bytes
+ = count_combining_after (string, nbytes, PT, PT_BYTE);
+
+ /* 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.
+
+ But there is no need to actually delete the combining bytes
+ from the buffer and reinsert them. */
+
+ if (combined_after_bytes)
+ {
+ deletion = make_buffer_string_both (PT, PT_BYTE,
+ PT + combined_after_bytes,
+ PT_BYTE + combined_after_bytes, 1);
+
+ adjust_markers_for_record_delete (PT, PT_BYTE,
+ PT + combined_after_bytes,
+ PT_BYTE + combined_after_bytes);
+ record_delete (PT, deletion);
+ }
+
+ if (combined_before_bytes)
+ {
+ deletion = make_buffer_string_both (PT - 1, CHAR_TO_BYTE (PT - 1),
+ PT, PT_BYTE, 1);
+ adjust_markers_for_record_delete (PT - 1, CHAR_TO_BYTE (PT - 1),
+ PT, PT_BYTE);
+ record_delete (PT - 1, deletion);
+ }
+
+ record_insert (PT - !!combined_before_bytes,
+ nchars - combined_before_bytes + !!combined_before_bytes);
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;
+ /* When we have combining at the end of the insertion,
+ this is the character position before the combined character. */
GPT += nchars;
ZV += nchars;
Z += 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 (combined_after_bytes)
+ move_gap_both (GPT + combined_after_bytes,
+ GPT_BYTE + combined_after_bytes);
if (GPT_BYTE < GPT)
abort ();
+ adjust_overlays_for_insert (PT, nchars);
+ adjust_markers_for_insert (PT, PT_BYTE,
+ PT + nchars, PT_BYTE + nbytes,
+ combined_before_bytes, combined_after_bytes,
+ before_markers);
+
#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);
+
if (!inherit && BUF_INTERVALS (current_buffer) != 0)
- Fset_text_properties (make_number (PT - nchars), make_number (PT),
+ Fset_text_properties (make_number (PT), make_number (PT + nchars),
Qnil, Qnil);
#endif
+
+ {
+ int pos = PT, pos_byte = PT_BYTE;
+
+ adjust_point (nchars + combined_after_bytes,
+ nbytes + combined_after_bytes);
+
+ if (combined_after_bytes)
+ combine_bytes (pos + nchars, pos_byte + nbytes, combined_after_bytes);
+
+ if (combined_before_bytes)
+ combine_bytes (pos, pos_byte, combined_before_bytes);
+ }
}
\f
/* Insert the part of the text of STRING, a Lisp object assumed to be
register Lisp_Object temp;
struct gcpro gcpro1;
int outgoing_nbytes = nbytes;
+ int combined_before_bytes, combined_after_bytes;
+ int adjusted_nchars;
+ INTERVAL intervals;
+ Lisp_Object deletion;
/* Make OUTGOING_NBYTES describe the text
as it will be inserted in this buffer. */
move_gap_both (PT, PT_BYTE);
if (GAP_SIZE < nbytes)
make_gap (outgoing_nbytes - GAP_SIZE);
-
- record_insert (PT, nchars);
- MODIFF++;
UNGCPRO;
/* Copy the string text into the buffer, perhaps converting
nchars != nbytes,
! NILP (current_buffer->enable_multibyte_characters));
- /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
- offset_intervals (current_buffer, PT, nchars);
+ /* 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. */
+
+ combined_before_bytes
+ = count_combining_before (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE);
+ combined_after_bytes
+ = count_combining_after (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE);
+
+ /* 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.
+
+ But there is no need to actually delete the combining bytes
+ from the buffer and reinsert them. */
+
+ if (combined_after_bytes)
+ {
+ deletion = make_buffer_string_both (PT, PT_BYTE,
+ PT + combined_after_bytes,
+ PT_BYTE + combined_after_bytes, 1);
+
+ adjust_markers_for_record_delete (PT, PT_BYTE,
+ PT + combined_after_bytes,
+ PT_BYTE + combined_after_bytes);
+ record_delete (PT, deletion);
+ }
+
+ if (combined_before_bytes)
+ {
+ deletion = make_buffer_string_both (PT - 1, CHAR_TO_BYTE (PT - 1),
+ PT, PT_BYTE, 1);
+ adjust_markers_for_record_delete (PT - 1, CHAR_TO_BYTE (PT - 1),
+ PT, PT_BYTE);
+ record_delete (PT - 1, deletion);
+ }
+
+ record_insert (PT - !!combined_before_bytes,
+ nchars - combined_before_bytes + !!combined_before_bytes);
+ 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 (combined_after_bytes)
+ move_gap_both (GPT + combined_after_bytes,
+ GPT_BYTE + combined_after_bytes);
+
+ if (GPT_BYTE < GPT)
+ abort ();
+
adjust_overlays_for_insert (PT, nchars);
adjust_markers_for_insert (PT, PT_BYTE, PT + nchars,
PT_BYTE + outgoing_nbytes,
+ combined_before_bytes, combined_after_bytes,
before_markers);
- if (GPT_BYTE < GPT)
- abort ();
+ /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
+ 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--
+ not including the combined-before bytes. */
+ if (nbytes < XSTRING (string)->size_byte)
+ 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 pos = PT, pos_byte = PT_BYTE;
+
+ adjust_point (nchars + combined_after_bytes,
+ outgoing_nbytes + combined_after_bytes);
+
+ if (combined_after_bytes)
+ combine_bytes (pos + nchars, pos_byte + outgoing_nbytes,
+ combined_after_bytes);
+
+ if (combined_before_bytes)
+ combine_bytes (pos, pos_byte, combined_before_bytes);
+ }
}
\f
/* Insert text from BUF, NCHARS characters starting at CHARPOS, into the
int from, nchars;
int inherit;
{
- register Lisp_Object temp;
+ register Lisp_Object temp, deletion;
int chunk;
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;
+ int combined_before_bytes, combined_after_bytes;
+ int adjusted_nchars;
+ INTERVAL intervals;
/* Make OUTGOING_NBYTES describe the text
as it will be inserted in this buffer. */
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;
! 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);
-#endif
+ /* 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. */
+ combined_before_bytes
+ = count_combining_before (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE);
+ combined_after_bytes
+ = count_combining_after (GPT_ADDR, outgoing_nbytes,
+ PT, PT_BYTE);
+
+ /* 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.
+
+ But there is no need to actually delete the combining bytes
+ from the buffer and reinsert them. */
+
+ if (combined_after_bytes)
+ {
+ deletion = make_buffer_string_both (PT, PT_BYTE,
+ PT + combined_after_bytes,
+ PT_BYTE + combined_after_bytes, 1);
+
+ adjust_markers_for_record_delete (PT, PT_BYTE,
+ PT + combined_after_bytes,
+ PT_BYTE + combined_after_bytes);
+ record_delete (PT, deletion);
+ }
+
+ if (combined_before_bytes)
+ {
+ deletion = make_buffer_string_both (PT - 1, CHAR_TO_BYTE (PT - 1),
+ PT, PT_BYTE, 1);
+ adjust_markers_for_record_delete (PT - 1, CHAR_TO_BYTE (PT - 1),
+ PT, PT_BYTE);
+ record_delete (PT - 1, deletion);
+ }
+
+ record_insert (PT - !!combined_before_bytes,
+ nchars - combined_before_bytes + !!combined_before_bytes);
+ 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. */
- adjust_overlays_for_insert (PT, nchars);
- adjust_markers_for_insert (PT, PT_BYTE, PT + nchars,
- PT_BYTE + outgoing_nbytes, 0);
- adjust_point (nchars, outgoing_nbytes);
+
+ if (combined_after_bytes)
+ move_gap_both (GPT + combined_after_bytes,
+ GPT_BYTE + combined_after_bytes);
if (GPT_BYTE < GPT)
abort ();
- /* 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);
+ adjust_overlays_for_insert (PT, nchars);
+ adjust_markers_for_insert (PT, PT_BYTE, PT + nchars,
+ PT_BYTE + outgoing_nbytes,
+ combined_before_bytes, combined_after_bytes, 0);
+
+#ifdef USE_TEXT_PROPERTIES
+ if (BUF_INTERVALS (current_buffer) != 0)
+ offset_intervals (current_buffer, PT, nchars);
+#endif
+
+ /* Get the intervals for the part of the string we are inserting--
+ not including the combined-before bytes. */
+ intervals = BUF_INTERVALS (buf);
+ if (outgoing_nbytes < BUF_Z_BYTE (buf) - BUF_BEG_BYTE (buf))
+ intervals = copy_intervals (intervals, from, nchars);
+
+ /* Insert those intervals. */
+ graft_intervals_into_buffer (intervals, PT, nchars, current_buffer, inherit);
+
+ {
+ int pos = PT, pos_byte = PT_BYTE;
+
+ adjust_point (nchars + combined_after_bytes,
+ outgoing_nbytes + combined_after_bytes);
+
+ if (combined_after_bytes)
+ combine_bytes (pos + nchars, pos_byte + outgoing_nbytes,
+ combined_after_bytes);
+
+ if (combined_before_bytes)
+ combine_bytes (pos, pos_byte, combined_before_bytes);
+ }
}
\f
+/* This function should be called after moving gap to FROM and before
+ altering text between FROM and TO. This adjusts various position
+ keepers and markers as if the text is deleted. Don't forget to
+ call adjust_after_replace after you actually alter the text. */
+
void
adjust_before_replace (from, from_byte, to, to_byte)
int from, from_byte, to, to_byte;
{
+ Lisp_Object deletion;
+ deletion = make_buffer_string_both (from, from_byte, to, to_byte, 1);
+
adjust_markers_for_delete (from, from_byte, to, to_byte);
- record_delete (from, to - from);
+ record_delete (from, deletion);
+ adjust_overlays_for_delete (from, to - from);
}
+/* This function should be called after altering the text between FROM
+ and TO to a new text of LEN chars (LEN_BYTE bytes), but before
+ making the text a buffer contents. It exists just after GPT_ADDR. */
+
void
-adjust_after_replace (from, from_byte, to, to_byte, len, len_byte)
- int from, from_byte, to, to_byte, len, len_byte;
+adjust_after_replace (from, from_byte, to, to_byte, len, len_byte, replace)
+ int from, from_byte, to, to_byte, len, len_byte, replace;
{
- record_insert (from, len);
- if (from < PT)
- adjust_point (len, len_byte);
-#ifdef USE_TEXT_PROPERTIES
- offset_intervals (current_buffer, PT, len - (to - from));
-#endif
- adjust_overlays_for_delete (from, to - from);
+ int combined_before_bytes
+ = count_combining_before (GPT_ADDR, len_byte, from, from_byte);
+ int combined_after_bytes
+ = count_combining_after (GPT_ADDR, len_byte, from, from_byte);
+ Lisp_Object deletion;
+
+ if (combined_after_bytes)
+ {
+ deletion = make_buffer_string_both (from, from_byte,
+ from + combined_after_bytes,
+ from_byte + combined_after_bytes, 1);
+
+ adjust_markers_for_record_delete (from, from_byte,
+ from + combined_after_bytes,
+ from_byte + combined_after_bytes);
+ record_delete (from, deletion);
+ }
+
+ if (combined_before_bytes)
+ {
+ deletion = make_buffer_string_both (from - 1, CHAR_TO_BYTE (from - 1),
+ from, from_byte, 1);
+ adjust_markers_for_record_delete (from - 1, CHAR_TO_BYTE (from - 1),
+ from, from_byte);
+ record_delete (from - 1, deletion);
+ }
+
+ /* 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 (combined_after_bytes)
+ move_gap_both (GPT + combined_after_bytes,
+ GPT_BYTE + combined_after_bytes);
+
+ record_insert (from - !!combined_before_bytes,
+ len - combined_before_bytes + !!combined_before_bytes);
adjust_overlays_for_insert (from, len);
adjust_markers_for_insert (from, from_byte,
- from + len, from_byte + len_byte, 0);
+ from + len, from_byte + len_byte,
+ combined_before_bytes, combined_after_bytes, 0);
+#ifdef USE_TEXT_PROPERTIES
+ if (BUF_INTERVALS (current_buffer) != 0)
+ /* REPLACE zero means that we have not yet adjusted the interval
+ tree for the text between FROM and TO, thus, we must treat the
+ new text as a newly inserted text, not as a replacement of
+ something. */
+ offset_intervals (current_buffer, from, len - (replace ? to - from : 0));
+#endif
+
+ {
+ int pos = PT, pos_byte = PT_BYTE;
+
+ if (from < PT)
+ adjust_point (len - (to - from) + combined_after_bytes,
+ len_byte - (to_byte - from_byte) + combined_after_bytes);
+ else if (from == PT && combined_before_bytes)
+ adjust_point (0, combined_before_bytes);
+
+ if (combined_after_bytes)
+ combine_bytes (from + len, from_byte + len_byte, combined_after_bytes);
+
+ if (combined_before_bytes)
+ combine_bytes (from, from_byte, combined_before_bytes);
+ }
+
if (len == 0)
evaporate_overlays (from);
MODIFF++;
- signal_after_change (from, to - from, len);
}
/* Replace the text from character positions FROM to TO with NEW,
That way, undo will also handle markers properly. */
void
-replace_range (from, to, new, prepare, inherit)
+replace_range (from, to, new, prepare, inherit, nomarkers)
Lisp_Object new;
- int from, to, prepare, inherit;
+ int from, to, prepare, inherit, nomarkers;
{
int inschars = XSTRING (new)->size;
int insbytes = XSTRING (new)->size_byte;
int nbytes_del, nchars_del;
register Lisp_Object temp;
struct gcpro gcpro1;
+ int combined_before_bytes, combined_after_bytes;
+ int adjusted_inschars;
+ INTERVAL intervals;
+ int outgoing_insbytes = insbytes;
+ Lisp_Object deletion;
GCPRO1 (new);
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 (inschars == insbytes)
+ 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);
+ deletion = make_buffer_string_both (from, from_byte, to, to_byte, 1);
+
+ if (nomarkers)
+ /* 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);
+ record_delete (from, deletion);
GAP_SIZE += nbytes_del;
ZV -= nchars_del;
if (GAP_SIZE < insbytes)
make_gap (insbytes - GAP_SIZE);
- record_insert (from, inschars);
+ /* Copy the string text into the buffer, perhaps converting
+ between single-byte and multibyte. */
+ copy_text (XSTRING (new)->data, GPT_ADDR, insbytes,
+ /* 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. */
+ inschars != insbytes,
+ ! NILP (current_buffer->enable_multibyte_characters));
- bcopy (XSTRING (new)->data, GPT_ADDR, insbytes);
+ /* 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. */
- /* 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)));
+ combined_before_bytes
+ = count_combining_before (GPT_ADDR, outgoing_insbytes, PT, PT_BYTE);
+ combined_after_bytes
+ = count_combining_after (GPT_ADDR, outgoing_insbytes, PT, PT_BYTE);
-#ifdef USE_TEXT_PROPERTIES
- offset_intervals (current_buffer, PT, inschars - nchars_del);
-#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.
+
+ But there is no need to actually delete the combining bytes
+ from the buffer and reinsert them. */
+
+ if (combined_after_bytes)
+ {
+ deletion = make_buffer_string_both (PT, PT_BYTE,
+ PT + combined_after_bytes,
+ PT_BYTE + combined_after_bytes, 1);
+
+ adjust_markers_for_record_delete (PT, PT_BYTE,
+ PT + combined_after_bytes,
+ PT_BYTE + combined_after_bytes);
+ record_delete (PT, deletion);
+ }
+
+ if (combined_before_bytes)
+ {
+ deletion = make_buffer_string_both (PT - 1, CHAR_TO_BYTE (PT - 1),
+ PT, PT_BYTE, 1);
+ adjust_markers_for_record_delete (PT - 1, CHAR_TO_BYTE (PT - 1),
+ PT, PT_BYTE);
+ record_delete (PT - 1, deletion);
+ }
+
+ record_insert (PT - !!combined_before_bytes,
+ inschars - combined_before_bytes + !!combined_before_bytes);
- GAP_SIZE -= insbytes;
+ 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 (combined_after_bytes)
+ move_gap_both (GPT + combined_after_bytes,
+ GPT_BYTE + combined_after_bytes);
+
if (GPT_BYTE < GPT)
abort ();
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 (nomarkers)
+ adjust_markers_for_insert (from, from_byte,
+ from + inschars, from_byte + outgoing_insbytes,
+ combined_before_bytes, combined_after_bytes, 0);
#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);
+ offset_intervals (current_buffer, PT, 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);
#endif
- if (insbytes == 0)
+ /* Relocate point as if it were a marker. */
+ if (from < PT)
+ adjust_point ((from + inschars - (PT < to ? PT : to)
+ + combined_after_bytes),
+ (from_byte + outgoing_insbytes
+ - (PT_BYTE < to_byte ? PT_BYTE : to_byte)
+ + combined_after_bytes));
+
+ if (combined_after_bytes)
+ combine_bytes (from + inschars, from_byte + outgoing_insbytes,
+ combined_after_bytes);
+
+ if (combined_before_bytes)
+ combine_bytes (from, from_byte, combined_before_bytes);
+
+ if (outgoing_insbytes == 0)
evaporate_overlays (from);
MODIFF++;
UNGCPRO;
- signal_after_change (from, nchars_del, inschars);
+ signal_after_change (from, nchars_del, PT - from);
}
\f
/* Delete characters in current buffer
from_byte = CHAR_TO_BYTE (from);
to_byte = CHAR_TO_BYTE (to);
- del_range_2 (from, to, from_byte, to_byte);
+ del_range_2 (from, from_byte, to, to_byte);
}
/* 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);
}
/* 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);
}
/* Delete a range of text, specified both as character positions
while FROM_BYTE and TO_BYTE are byte positions. */
void
-del_range_2 (from, to, from_byte, to_byte)
- int from, to, from_byte, to_byte;
+del_range_2 (from, from_byte, to, to_byte)
+ int from, from_byte, to, to_byte;
{
register int nbytes_del, nchars_del;
+ int combined_after_bytes;
+ Lisp_Object deletion;
+ int from_byte_1;
nchars_del = to - from;
nbytes_del = to_byte - from_byte;
if (to < GPT)
gap_left (to, to_byte, 0);
+ combined_after_bytes
+ = count_combining_before (BUF_BYTE_ADDRESS (current_buffer, to_byte),
+ ZV_BYTE - to_byte, from, from_byte);
+ if (combined_after_bytes)
+ {
+ from_byte_1 = from_byte;
+ DEC_POS (from_byte_1);
+ }
+ else
+ from_byte_1 = from_byte;
+
+ deletion
+ = make_buffer_string_both (from - !!combined_after_bytes,
+ from_byte_1,
+ to + combined_after_bytes,
+ to_byte + combined_after_bytes, 1);
+
/* 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);
+ if (combined_after_bytes)
+ {
+ /* Adjust markers for the phony deletion
+ that we are about to call record_undo for. */
+
+ /* Here we delete the markers that formerly
+ pointed at TO ... TO + COMBINED_AFTER_BYTES.
+ But because of the call to adjust_markers_for_delete, above,
+ they now point at FROM ... FROM + COMBINED_AFTER_BYTES. */
+ adjust_markers_for_record_delete (from, from_byte,
+ from + combined_after_bytes,
+ from_byte + combined_after_bytes);
+
+ adjust_markers_for_record_delete (from - 1, from_byte_1,
+ from, from_byte);
+ }
+ record_delete (from - !!combined_after_bytes, deletion);
- record_delete (from, nchars_del);
+ if (combined_after_bytes)
+ /* COMBINED_AFTER_BYTES nonzero means that the above record_delete
+ moved the gap by calling Fbuffer_substring. We must move the
+ gap again to a proper place. */
+ move_gap_both (from, from_byte);
MODIFF++;
/* Relocate point as if it were a marker. */
/* 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;
Z -= nchars_del;
GPT = from;
GPT_BYTE = from_byte;
+
+ if (combined_after_bytes)
+ move_gap_both (GPT + combined_after_bytes,
+ GPT_BYTE + combined_after_bytes);
+
*(GPT_ADDR) = 0; /* Put an anchor. */
if (GPT_BYTE < GPT)
if (Z - GPT < end_unchanged)
end_unchanged = Z - GPT;
+ if (combined_after_bytes)
+ {
+ combine_bytes (from, from_byte, combined_after_bytes);
+
+ record_insert (GPT - 1, 1);
+ }
+
evaporate_overlays (from);
signal_after_change (from, nchars_del, 0);
}
HCoop / bpt / emacs.git / blobdiff