/* Buffer insertion/deletion and gap motion for GNU Emacs.
- Copyright (C) 1985, 86,93,94,95,97,98, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001,
+ 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
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
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
#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_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, 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_markers_for_insert P_ ((int, 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;
+
+Lisp_Object Qinhibit_modification_hooks;
+
\f
/* Check all markers in the current buffer, looking for something invalid. */
void
check_markers ()
{
- register Lisp_Object tail;
+ register struct Lisp_Marker *tail;
int multibyte = ! NILP (current_buffer->enable_multibyte_characters);
- tail = BUF_MARKERS (current_buffer);
-
- while (XSYMBOL (tail) != XSYMBOL (Qnil))
+ for (tail = BUF_MARKERS (current_buffer); tail; tail = tail->next)
{
- if (XMARKER (tail)->buffer->text != current_buffer->text)
+ if (tail->buffer->text != current_buffer->text)
abort ();
- if (XMARKER (tail)->charpos > Z)
+ if (tail->charpos > Z)
abort ();
- if (XMARKER (tail)->bytepos > Z_BYTE)
+ if (tail->bytepos > Z_BYTE)
abort ();
- if (multibyte && ! CHAR_HEAD_P (FETCH_BYTE (XMARKER (tail)->bytepos)))
+ if (multibyte && ! CHAR_HEAD_P (FETCH_BYTE (tail->bytepos)))
abort ();
-
- tail = XMARKER (tail)->chain;
}
}
\f
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;
{
register struct Lisp_Marker *m;
register int charpos;
- marker = BUF_MARKERS (current_buffer);
-
- while (!NILP (marker))
+ for (m = BUF_MARKERS (current_buffer); m; m = m->next)
{
- m = XMARKER (marker);
charpos = m->charpos;
if (charpos > Z)
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. */
+ XSETMISC (marker, m);
+ 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. */
+ XSETMISC (marker, m);
+ record_marker_adjustment (marker, charpos - to);
+ }
m->charpos = from;
m->bytepos = from_byte;
}
-
- marker = m->chain;
+ /* Here's the case where a before-insertion marker is immediately
+ before the deleted region. */
+ else if (charpos == from && m->insertion_type)
+ {
+ /* 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. */
+ XSETMISC (marker, m);
+ record_marker_adjustment (marker, to - from);
+ }
}
}
\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. */
-
-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;
-
- 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 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).
- 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,
- combined_before_bytes, combined_after_bytes,
- before_markers)
+adjust_markers_for_insert (from, from_byte, to, to_byte, before_markers)
register int from, from_byte, to, to_byte;
- int combined_before_bytes, combined_after_bytes, before_markers;
+ int before_markers;
{
- Lisp_Object marker;
+ struct Lisp_Marker *m;
int adjusted = 0;
int nchars = to - from;
int nbytes = to_byte - from_byte;
- marker = BUF_MARKERS (current_buffer);
-
- while (!NILP (marker))
+ for (m = BUF_MARKERS (current_buffer); m; m = m->next)
{
- register struct Lisp_Marker *m = XMARKER (marker);
-
- /* 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.) */
+ /* In a single-byte buffer, a marker's two positions must be
+ equal. */
if (Z == Z_BYTE)
{
if (m->charpos != m->bytepos)
{
if (m->insertion_type || before_markers)
{
- m->bytepos = to_byte + combined_after_bytes;
- m->charpos = to - combined_before_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);
+ m->bytepos = to_byte;
+ m->charpos = to;
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. */
- m->bytepos += combined_before_bytes;
- if (combined_before_bytes == nbytes)
- /* All new bytes plus combined_after_bytes (if any)
- are combined. */
- m->bytepos += combined_after_bytes;
- }
- }
- /* 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 - combined_before_bytes;
- /* 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->bytepos += nbytes;
- m->charpos += nchars - combined_after_bytes - combined_before_bytes;
+ m->charpos += nchars;
}
-
- marker = m->chain;
}
/* Adjusting only markers whose insertion-type is t may result in
- disordered overlays in the slot `overlays_before'. */
+ - disordered start and end in overlays, and
+ - disordered overlays in the slot `overlays_before' of current_buffer. */
if (adjusted)
- fix_overlays_before (current_buffer, from, to);
+ {
+ fix_start_end_in_overlays(from, to);
+ fix_overlays_before (current_buffer, from, to);
+ }
}
/* Adjust point for an insertion of NBYTES bytes, which are NCHARS characters.
\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).
-
- See the comment of adjust_markers_for_insert for the args
- COMBINED_BEFORE_BYTES and COMBINED_AFTER_BYTES. */
+ (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,
- combined_before_bytes, combined_after_bytes)
+ new_chars, new_bytes)
int from, from_byte, old_chars, old_bytes, new_chars, new_bytes;
- int combined_before_bytes, combined_after_bytes;
{
- Lisp_Object marker = BUF_MARKERS (current_buffer);
+ register struct Lisp_Marker *m;
int prev_to_byte = from_byte + old_bytes;
- int diff_chars
- = (new_chars - combined_before_bytes) - (old_chars + combined_after_bytes);
+ int diff_chars = new_chars - old_chars;
int diff_bytes = new_bytes - old_bytes;
- while (!NILP (marker))
+ for (m = BUF_MARKERS (current_buffer); m; m = m->next)
{
- register struct Lisp_Marker *m = XMARKER (marker);
-
- if (m->bytepos >= prev_to_byte
- && (old_bytes != 0
- /* If this is an insertion (replacing 0 chars),
- reject the case of a marker that is at the
- insertion point and should stay before the insertion. */
- || m->bytepos > from_byte || m->insertion_type))
+ if (m->bytepos >= prev_to_byte)
{
- if (m->bytepos < prev_to_byte + combined_after_bytes)
- {
- /* Put it after the combining bytes. */
- m->bytepos = from_byte + new_bytes + combined_after_bytes;
- m->charpos = from + new_chars - combined_before_bytes;
- }
- else
- {
- m->charpos += diff_chars;
- m->bytepos += diff_bytes;
- }
+ m->charpos += diff_chars;
+ m->bytepos += diff_bytes;
}
- else if (m->bytepos >= from_byte)
+ else if (m->bytepos > from_byte)
{
m->charpos = from;
- m->bytepos = from_byte + combined_before_bytes;
- /* If all new bytes are combined in addition to that there
- are after combining bytes, we must set byte position of
- the marker after the after combining bytes. */
- if (combined_before_bytes == new_bytes)
- m->bytepos += combined_after_bytes;
+ m->bytepos = from_byte;
}
-
- marker = m->chain;
}
CHECK_MARKERS ();
/* Make the gap NBYTES_ADDED bytes longer. */
void
-make_gap (nbytes_added)
+make_gap_larger (nbytes_added)
int nbytes_added;
{
- unsigned char *result;
Lisp_Object tem;
int real_gap_loc;
int real_gap_loc_byte;
/* 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'. */
-
- if (Z_BYTE - BEG_BYTE + GAP_SIZE + nbytes_added
- >= ((unsigned) 1 << (min (BITS_PER_INT, VALBITS) - 1)))
- error ("Buffer exceeds maximum size");
+ That won't work because so many places use `int'.
- 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));
+ Make sure we don't introduce overflows in the calculation. */
- if (result == 0)
- {
- UNBLOCK_INPUT;
- memory_full ();
- }
+ if (Z_BYTE - BEG_BYTE + GAP_SIZE
+ >= (((EMACS_INT) 1 << (min (VALBITS, BITS_PER_INT) - 1)) - 1
+ - nbytes_added))
+ error ("Buffer exceeds maximum size");
- /* 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;
Vinhibit_quit = tem;
}
+
+
+/* Make the gap NBYTES_REMOVED bytes shorter. */
+
+void
+make_gap_smaller (nbytes_removed)
+ int nbytes_removed;
+{
+ Lisp_Object tem;
+ int real_gap_loc;
+ int real_gap_loc_byte;
+ int real_Z;
+ int real_Z_byte;
+ int real_beg_unchanged;
+ int new_gap_size;
+
+ /* Make sure the gap is at least 20 bytes. */
+ if (GAP_SIZE - nbytes_removed < 20)
+ nbytes_removed = GAP_SIZE - 20;
+
+ /* Prevent quitting in move_gap. */
+ tem = Vinhibit_quit;
+ Vinhibit_quit = Qt;
+
+ real_gap_loc = GPT;
+ real_gap_loc_byte = GPT_BYTE;
+ new_gap_size = GAP_SIZE - nbytes_removed;
+ real_Z = Z;
+ real_Z_byte = Z_BYTE;
+ real_beg_unchanged = BEG_UNCHANGED;
+
+ /* Pretend that the last unwanted part of the gap is the entire gap,
+ and that the first desired part of the gap is part of the buffer
+ text. */
+ bzero (GPT_ADDR, new_gap_size);
+ GPT += new_gap_size;
+ GPT_BYTE += new_gap_size;
+ Z += new_gap_size;
+ Z_BYTE += new_gap_size;
+ GAP_SIZE = nbytes_removed;
+
+ /* Move the unwanted pretend gap to the end of the buffer. This
+ adjusts the markers properly too. */
+ gap_right (Z, Z_BYTE);
+
+ enlarge_buffer_text (current_buffer, -nbytes_removed);
+
+ /* Now restore the desired gap. */
+ GAP_SIZE = new_gap_size;
+ GPT = real_gap_loc;
+ GPT_BYTE = real_gap_loc_byte;
+ Z = real_Z;
+ Z_BYTE = real_Z_byte;
+ BEG_UNCHANGED = real_beg_unchanged;
+
+ /* Put an anchor. */
+ *(Z_ADDR) = 0;
+
+ Vinhibit_quit = tem;
+}
+
+void
+make_gap (nbytes_added)
+ int nbytes_added;
+{
+ if (nbytes_added >= 0)
+ make_gap_larger (nbytes_added);
+#if defined USE_MMAP_FOR_BUFFERS || defined REL_ALLOC || defined DOUG_LEA_MALLOC
+ else
+ make_gap_smaller (-nbytes_added);
+#endif
+}
\f
/* Copy NBYTES bytes of text from FROM_ADDR to TO_ADDR.
FROM_MULTIBYTE says whether the incoming text is multibyte.
int
copy_text (from_addr, to_addr, nbytes,
from_multibyte, to_multibyte)
- unsigned char *from_addr;
+ const unsigned char *from_addr;
unsigned char *to_addr;
int nbytes;
int from_multibyte, to_multibyte;
/* Convert multibyte to single byte. */
while (bytes_left > 0)
{
- int thislen, c, c_save;
- c = c_save = STRING_CHAR_AND_LENGTH (from_addr, bytes_left, thislen);
+ int thislen, c;
+ c = STRING_CHAR_AND_LENGTH (from_addr, bytes_left, thislen);
if (!SINGLE_BYTE_CHAR_P (c))
c = multibyte_char_to_unibyte (c, tbl);
*to_addr++ = c;
while (nbytes > 0)
{
int c = *from_addr++;
- unsigned char workbuf[4], *str;
- int len;
- if (c < 0400
- && (c >= 0240
- || (c >= 0200 && !NILP (Vnonascii_translation_table))))
+ if (c >= 0200)
{
c = unibyte_char_to_multibyte (c);
- len = CHAR_STRING (c, workbuf, str);
- bcopy (str, to_addr, len);
- to_addr += len;
+ to_addr += CHAR_STRING (c, to_addr);
nbytes--;
}
else
int
count_size_as_multibyte (ptr, nbytes)
- unsigned char *ptr;
+ const unsigned char *ptr;
int nbytes;
{
int i;
{
unsigned int c = *ptr++;
- if (c < 0200 || (c < 0240 && NILP (Vnonascii_translation_table)))
+ if (c < 0200)
outgoing_nbytes++;
else
{
void
insert (string, nbytes)
- register unsigned char *string;
+ register const unsigned char *string;
register int nbytes;
{
if (nbytes > 0)
{
- int opoint = PT;
- insert_1 (string, nbytes, 0, 1, 0);
- signal_after_change (opoint, 0, PT - opoint);
+ int len = chars_in_text (string, nbytes), opoint;
+ insert_1_both (string, len, nbytes, 0, 1, 0);
+ opoint = PT - len;
+ signal_after_change (opoint, 0, len);
+ update_compositions (opoint, PT, CHECK_BORDER);
}
}
void
insert_and_inherit (string, nbytes)
- register unsigned char *string;
+ register const unsigned char *string;
register int nbytes;
{
if (nbytes > 0)
{
- int opoint = PT;
- insert_1 (string, nbytes, 1, 1, 0);
- signal_after_change (opoint, 0, PT - opoint);
+ int len = chars_in_text (string, nbytes), opoint;
+ insert_1_both (string, len, nbytes, 1, 1, 0);
+ opoint = PT - len;
+ signal_after_change (opoint, 0, len);
+ 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);
void
insert_string (s)
- char *s;
+ const char *s;
{
insert (s, strlen (s));
}
void
insert_before_markers (string, nbytes)
- unsigned char *string;
+ const unsigned char *string;
register int nbytes;
{
if (nbytes > 0)
{
- int opoint = PT;
-
- insert_1 (string, nbytes, 0, 1, 1);
- signal_after_change (opoint, 0, PT - opoint);
+ int len = chars_in_text (string, nbytes), opoint;
+ insert_1_both (string, len, nbytes, 0, 1, 1);
+ opoint = PT - len;
+ signal_after_change (opoint, 0, len);
+ update_compositions (opoint, PT, CHECK_BORDER);
}
}
void
insert_before_markers_and_inherit (string, nbytes)
- unsigned char *string;
+ const unsigned char *string;
register int nbytes;
{
if (nbytes > 0)
{
- int opoint = PT;
-
- insert_1 (string, nbytes, 1, 1, 1);
- signal_after_change (opoint, 0, PT - opoint);
+ int len = chars_in_text (string, nbytes), opoint;
+ insert_1_both (string, len, nbytes, 1, 1, 1);
+ opoint = PT - len;
+ signal_after_change (opoint, 0, len);
+ update_compositions (opoint, PT, CHECK_BORDER);
}
}
void
insert_1 (string, nbytes, inherit, prepare, before_markers)
- register unsigned char *string;
+ register const unsigned char *string;
register int nbytes;
int inherit, prepare, before_markers;
{
insert_1_both (string, chars_in_text (string, nbytes), nbytes,
inherit, prepare, before_markers);
}
-\f
-/* See if the byte sequence at STR1 of length LEN1 combine with the
- byte sequence at STR2 of length LEN2 to form a single composite
- character. If so, return the number of bytes at the start of STR2
- which combine in this way. Otherwise, return 0. If STR3 is not
- NULL, it is a byte sequence of length LEN3 to be appended to STR1
- before checking the combining. */
-int
-count_combining_composition (str1, len1, str2, len2, str3, len3)
- unsigned char *str1, *str2, *str3;
- int len1, len2, len3;
-{
- int len = len1 + len2 + len3;
- unsigned char *buf = (unsigned char *) alloca (len + 1);
- int bytes;
- bcopy (str1, buf, len1);
- if (str3)
- {
- bcopy (str3, buf + len1, len3);
- len1 += len3;
- }
- bcopy (str2, buf + len1 , len2);
- buf[len] = 0;
- PARSE_MULTIBYTE_SEQ (buf, len, bytes);
- return (bytes <= len1 ? 0 : bytes - len1);
-}
+\f
+#ifdef BYTE_COMBINING_DEBUG
/* See if the bytes before POS/POS_BYTE combine with bytes
at the start of STRING to form a single character.
int
count_combining_before (string, length, pos, pos_byte)
- unsigned char *string;
+ const unsigned char *string;
int length;
int pos, pos_byte;
{
int len, combining_bytes;
- unsigned char *p;
+ const unsigned char *p;
if (NILP (current_buffer->enable_multibyte_characters))
return 0;
if (! BASE_LEADING_CODE_P (*p)) /* case (3) */
return 0;
- /* A sequence of a composite character requires a special handling. */
- if (*p == LEADING_CODE_COMPOSITION)
- return count_combining_composition (p, len, string, length, NULL, 0);
-
combining_bytes = BYTES_BY_CHAR_HEAD (*p) - len;
if (combining_bytes <= 0)
/* The character preceding POS is, complete and no room for
int
count_combining_after (string, length, pos, pos_byte)
- unsigned char *string;
+ const unsigned char *string;
int length;
int pos, pos_byte;
{
i--;
if (i < 0 || !BASE_LEADING_CODE_P (p[i]))
return 0;
- /* A sequence of a composite character requires a special handling. */
- if (p[i] == LEADING_CODE_COMPOSITION)
- return count_combining_composition (p + i, pos_byte - 1 - i,
- bufp, Z_BYTE - pos_byte,
- string, length);
+
bytes = BYTES_BY_CHAR_HEAD (p[i]);
return (bytes <= pos_byte - 1 - i + length
? 0
}
if (!BASE_LEADING_CODE_P (string[i]))
return 0;
- /* A sequence of a composite character requires a special handling. */
- if (string[i] == LEADING_CODE_COMPOSITION)
- return count_combining_composition (string + i, length - i,
- bufp, Z_BYTE - pos_byte, NULL, 0);
bytes = BYTES_BY_CHAR_HEAD (string[i]) - (length - i);
bufp++, pos_byte++;
return (bytes <= pos_byte - opos_byte ? bytes : pos_byte - opos_byte);
}
-/* 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.
-
- This function does not adjust markers for byte combining. That
- should be done in advance by the functions
- adjust_markers_for_insert or adjust_markers_for_replace. */
-
-static void
-combine_bytes (pos, pos_byte, nbytes)
- int pos, pos_byte, nbytes;
-{
- 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);
-}
-
-void
-byte_combining_error ()
-{
- error ("Byte combining across boundary of accessible buffer text inhibitted");
-}
-
-/* If we are going to combine bytes at POS which is at a narrowed
- region boundary, signal an error. */
-#define CHECK_BYTE_COMBINING_FOR_INSERT(pos) \
- do { \
- if ((combined_before_bytes && pos == BEGV) \
- || (combined_after_bytes && pos == ZV)) \
- byte_combining_error (); \
- } while (0)
+#endif
\f
/* Insert a sequence of NCHARS chars which occupy NBYTES bytes
void
insert_1_both (string, nchars, nbytes, inherit, prepare, before_markers)
- register unsigned char *string;
+ register const unsigned char *string;
register int nchars, nbytes;
int inherit, prepare, before_markers;
{
- int combined_before_bytes, combined_after_bytes;
+ if (nchars == 0)
+ return;
if (NILP (current_buffer->enable_multibyte_characters))
nchars = nbytes;
if (GAP_SIZE < nbytes)
make_gap (nbytes - GAP_SIZE);
- combined_before_bytes
- = count_combining_before (string, nbytes, PT, PT_BYTE);
- combined_after_bytes
- = count_combining_after (string, nbytes, PT, PT_BYTE);
- CHECK_BYTE_COMBINING_FOR_INSERT (PT);
+#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.
-
- But there is no need to actually delete the combining bytes
- from the buffer and reinsert them. */
-
- if (combined_after_bytes)
- {
- Lisp_Object deletion;
- deletion = Qnil;
-
- if (! EQ (current_buffer->undo_list, Qt))
- 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);
- if (! EQ (current_buffer->undo_list, Qt))
- record_delete (PT, deletion);
- }
-
- if (combined_before_bytes)
- {
- Lisp_Object deletion;
- deletion = Qnil;
-
- if (! EQ (current_buffer->undo_list, Qt))
- 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);
- if (! EQ (current_buffer->undo_list, Qt))
- record_delete (PT - 1, deletion);
- }
-
- record_insert (PT - !!combined_before_bytes,
- nchars - combined_before_bytes + !!combined_before_bytes);
+ will add up to the right stuff in the undo list. */
+ record_insert (PT, nchars);
MODIFF++;
+ CHARS_MODIFF = MODIFF;
bcopy (string, GPT_ADDR, nbytes);
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;
Z_BYTE += 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 ();
+ /* The insert may have been in the unchanged region, so check again. */
+ if (Z - GPT < END_UNCHANGED)
+ END_UNCHANGED = Z - GPT;
+
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), make_number (PT + nchars),
- Qnil, Qnil);
-#endif
-
- {
- int pos = PT, pos_byte = PT_BYTE;
-
- adjust_point (nchars + combined_after_bytes,
- nbytes + combined_after_bytes);
+ set_text_properties (make_number (PT), make_number (PT + nchars),
+ Qnil, Qnil, Qnil);
- 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);
- }
+ adjust_point (nchars, nbytes);
CHECK_MARKERS ();
}
int inherit;
{
int opoint = PT;
+
+ if (SCHARS (string) == 0)
+ return;
+
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
int inherit;
{
int opoint = PT;
+
+ if (SCHARS (string) == 0)
+ return;
+
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. */
{
struct gcpro gcpro1;
int outgoing_nbytes = nbytes;
- int combined_before_bytes, combined_after_bytes;
INTERVAL intervals;
/* Make OUTGOING_NBYTES describe the text
outgoing_nbytes = nchars;
else if (! STRING_MULTIBYTE (string))
outgoing_nbytes
- = count_size_as_multibyte (&XSTRING (string)->data[pos_byte],
+ = count_size_as_multibyte (SDATA (string) + pos_byte,
nbytes);
GCPRO1 (string);
/* Copy the string text into the buffer, perhaps converting
between single-byte and multibyte. */
- copy_text (XSTRING (string)->data + pos_byte, GPT_ADDR, nbytes,
+ copy_text (SDATA (string) + pos_byte, GPT_ADDR, nbytes,
STRING_MULTIBYTE (string),
! NILP (current_buffer->enable_multibyte_characters));
+#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
- 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);
- {
- unsigned char save = *(GPT_ADDR);
- *(GPT_ADDR) = 0;
- CHECK_BYTE_COMBINING_FOR_INSERT (PT);
- *(GPT_ADDR) = save;
- }
-
- /* 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)
- {
- Lisp_Object deletion;
- deletion = Qnil;
-
- if (! EQ (current_buffer->undo_list, Qt))
- 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);
- if (! EQ (current_buffer->undo_list, Qt))
- record_delete (PT, deletion);
- }
-
- if (combined_before_bytes)
- {
- Lisp_Object deletion;
- deletion = Qnil;
-
- if (! EQ (current_buffer->undo_list, Qt))
- 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);
- if (! EQ (current_buffer->undo_list, Qt))
- record_delete (PT - 1, deletion);
- }
-
- record_insert (PT - !!combined_before_bytes,
- nchars - combined_before_bytes + !!combined_before_bytes);
+ record_insert (PT, nchars);
MODIFF++;
+ CHARS_MODIFF = MODIFF;
GAP_SIZE -= outgoing_nbytes;
GPT += nchars;
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 ();
+ /* The insert may have been in the unchanged region, so check again. */
+ if (Z - GPT < END_UNCHANGED)
+ END_UNCHANGED = Z - GPT;
+
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);
- /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
offset_intervals (current_buffer, 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 < STRING_BYTES (XSTRING (string)))
+ intervals = STRING_INTERVALS (string);
+ /* Get the intervals for the part of the string we are inserting. */
+ if (nbytes < SBYTES (string))
intervals = copy_intervals (intervals, pos, 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);
- }
+ adjust_point (nchars, outgoing_nbytes);
}
\f
/* Insert text from BUF, NCHARS characters starting at CHARPOS, into the
insert_from_buffer_1 (buf, charpos, nchars, inherit);
signal_after_change (opoint, 0, PT - opoint);
+ update_compositions (opoint, PT, CHECK_BORDER);
}
static void
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;
INTERVAL intervals;
/* Make OUTGOING_NBYTES describe the text
if (chunk < incoming_nbytes)
outgoing_after_gap
- = count_size_as_multibyte (BUF_BYTE_ADDRESS (buf,
+ = 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))
! NILP (buf->enable_multibyte_characters),
! NILP (current_buffer->enable_multibyte_characters));
+#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. */
- 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);
- {
- unsigned char save = *(GPT_ADDR);
- *(GPT_ADDR) = 0;
- CHECK_BYTE_COMBINING_FOR_INSERT (PT);
- *(GPT_ADDR) = save;
- }
-
- /* 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)
- {
- Lisp_Object deletion;
- deletion = Qnil;
-
- if (! EQ (current_buffer->undo_list, Qt))
- 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);
- if (! EQ (current_buffer->undo_list, Qt))
- record_delete (PT, deletion);
- }
-
- if (combined_before_bytes)
- {
- Lisp_Object deletion;
- deletion = Qnil;
-
- if (! EQ (current_buffer->undo_list, Qt))
- 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);
- if (! EQ (current_buffer->undo_list, Qt))
- record_delete (PT - 1, deletion);
- }
+ 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 - !!combined_before_bytes,
- nchars - combined_before_bytes + !!combined_before_bytes);
+ record_insert (PT, nchars);
MODIFF++;
+ CHARS_MODIFF = MODIFF;
GAP_SIZE -= outgoing_nbytes;
GPT += nchars;
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 ();
+ /* The insert may have been in the unchanged region, so check again. */
+ if (Z - GPT < END_UNCHANGED)
+ END_UNCHANGED = Z - GPT;
+
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);
+ 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. */
+ /* 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))
- intervals = copy_intervals (intervals, from, nchars);
-
+ {
+ 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);
- {
- 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);
- }
+ adjust_point (nchars, outgoing_nbytes);
}
\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;
-
- if (! EQ (current_buffer->undo_list, Qt))
- deletion = make_buffer_string_both (from, from_byte, to, to_byte, 1);
-
- CHECK_MARKERS ();
-
- adjust_markers_for_delete (from, from_byte, to, to_byte);
-
- if (! EQ (current_buffer->undo_list, Qt))
- record_delete (from, deletion);
-
- adjust_overlays_for_delete (from, to - from);
-}
-
/* 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
int from, from_byte, len, len_byte;
Lisp_Object prev_text;
{
- 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);
- /* This flag tells if we combine some bytes with a character before
- FROM. This happens even if combined_before_bytes is zero. */
- int combine_before = (combined_before_bytes
- || (len == 0 && combined_after_bytes));
-
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
+
if (STRINGP (prev_text))
{
- nchars_del = XSTRING (prev_text)->size;
- nbytes_del = STRING_BYTES (XSTRING (prev_text));
+ nchars_del = SCHARS (prev_text);
+ nbytes_del = SBYTES (prev_text);
}
- if ((combine_before && from == BEGV)
- || (combined_after_bytes && from == ZV))
+ /* 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))
{
- /* We can't combine bytes nor signal an error here. So, let's
- pretend that the new text is just a single space. */
- len = len_byte = 1;
- combined_before_bytes = combined_after_bytes = 0;
- *(GPT_ADDR) = ' ';
+ if (nchars_del > 0)
+ record_delete (from, prev_text);
+ record_insert (from, len);
}
- if (combined_after_bytes)
+ 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)
{
- Lisp_Object deletion;
- deletion = Qnil;
+ offset_intervals (current_buffer, from, len - nchars_del);
+ }
- if (! EQ (current_buffer->undo_list, Qt))
- deletion = make_buffer_string_both (from, from_byte,
- from + combined_after_bytes,
- from_byte + combined_after_bytes,
- 1);
+ if (from < PT)
+ adjust_point (len - nchars_del, len_byte - nbytes_del);
- adjust_markers_for_record_delete (from, from_byte,
- from + combined_after_bytes,
- from_byte + combined_after_bytes);
+ /* As byte combining will decrease Z, we must check this again. */
+ if (Z - GPT < END_UNCHANGED)
+ END_UNCHANGED = Z - GPT;
- if (! EQ (current_buffer->undo_list, Qt))
- record_delete (from + nchars_del, deletion);
- }
+ CHECK_MARKERS ();
- if (combined_before_bytes
- || (len_byte == 0 && combined_after_bytes > 0))
- {
- Lisp_Object deletion;
- deletion = Qnil;
-
- if (! EQ (current_buffer->undo_list, Qt))
- 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);
- if (! EQ (current_buffer->undo_list, Qt))
- record_delete (from - 1, deletion);
- }
+ if (len == 0)
+ evaporate_overlays (from);
+ MODIFF++;
+ CHARS_MODIFF = MODIFF;
+}
+
+/* Like adjust_after_replace, but doesn't require PREV_TEXT.
+ This is for use when undo is not enabled in the current buffer. */
+
+void
+adjust_after_replace_noundo (from, from_byte, nchars_del, nbytes_del, len, len_byte)
+ int from, from_byte, nchars_del, nbytes_del, len, len_byte;
+{
+#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
/* Update various buffer positions for the new text. */
GAP_SIZE -= len_byte;
GPT += len; GPT_BYTE += len_byte;
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
- /* The gap should be at character boundary. */
- if (combined_after_bytes)
- move_gap_both (GPT + combined_after_bytes,
- GPT_BYTE + combined_after_bytes);
-
- adjust_markers_for_replace (from, from_byte, nchars_del, nbytes_del,
- len, len_byte,
- combined_before_bytes, combined_after_bytes);
- if (! EQ (current_buffer->undo_list, Qt))
- {
- if (nchars_del > 0)
- record_delete (from - combine_before, prev_text);
- if (combine_before)
- record_insert (from - 1, len - combined_before_bytes + 1);
- else
- record_insert (from, len);
- }
+ 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 (len > nchars_del)
adjust_overlays_for_insert (from, len - nchars_del);
else if (len < nchars_del)
adjust_overlays_for_delete (from, nchars_del - len);
-#ifdef USE_TEXT_PROPERTIES
if (BUF_INTERVALS (current_buffer) != 0)
{
offset_intervals (current_buffer, from, len - nchars_del);
}
-#endif
- {
- if (from < PT)
- adjust_point (len - nchars_del, len_byte - nbytes_del);
-
- if (combined_after_bytes)
- {
- if (combined_before_bytes == len_byte)
- /* This is the case that all new bytes are combined. */
- combined_before_bytes += combined_after_bytes;
- else
- combine_bytes (from + len, from_byte + len_byte,
- combined_after_bytes);
- }
- if (combined_before_bytes)
- combine_bytes (from, from_byte, combined_before_bytes);
- }
+ 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)
if (len == 0)
evaporate_overlays (from);
MODIFF++;
+ CHARS_MODIFF = MODIFF;
}
/* Record undo information, adjust markers and position keepers for an
Z -= len; Z_BYTE -= len_byte;
adjust_after_replace (from, from_byte, Qnil, newlen, len_byte);
}
-
+\f
/* 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
Lisp_Object new;
int from, to, prepare, inherit, markers;
{
- int inschars = XSTRING (new)->size;
- int insbytes = STRING_BYTES (XSTRING (new));
+ int inschars = SCHARS (new);
+ int insbytes = SBYTES (new);
int from_byte, to_byte;
int nbytes_del, nchars_del;
register Lisp_Object temp;
struct gcpro gcpro1;
- int combined_before_bytes, combined_after_bytes;
INTERVAL intervals;
int outgoing_insbytes = insbytes;
Lisp_Object deletion;
CHECK_MARKERS ();
GCPRO1 (new);
+ deletion = Qnil;
if (prepare)
{
outgoing_insbytes = inschars;
else if (! STRING_MULTIBYTE (new))
outgoing_insbytes
- = count_size_as_multibyte (XSTRING (new)->data, insbytes);
+ = count_size_as_multibyte (SDATA (new), insbytes);
/* Make sure point-max won't overflow after this insertion. */
XSETINT (temp, Z_BYTE - nbytes_del + insbytes);
/* 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. */
- deletion = make_buffer_string_both (from, from_byte, to, to_byte, 1);
-
- 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);
+ if (! EQ (current_buffer->undo_list, Qt))
+ deletion = make_buffer_string_both (from, from_byte, to, to_byte, 1);
GAP_SIZE += nbytes_del;
ZV -= nchars_del;
Z_BYTE -= nbytes_del;
GPT = from;
GPT_BYTE = from_byte;
- *(GPT_ADDR) = 0; /* Put an anchor. */
+ if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
if (GPT_BYTE < GPT)
abort ();
/* Copy the string text into the buffer, perhaps converting
between single-byte and multibyte. */
- copy_text (XSTRING (new)->data, GPT_ADDR, insbytes,
+ copy_text (SDATA (new), GPT_ADDR, insbytes,
STRING_MULTIBYTE (new),
! NILP (current_buffer->enable_multibyte_characters));
+#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. */
-
- combined_before_bytes
- = count_combining_before (GPT_ADDR, outgoing_insbytes, from, from_byte);
- combined_after_bytes
- = count_combining_after (GPT_ADDR, outgoing_insbytes, from, from_byte);
-
- if ((combined_before_bytes && from == BEGV)
- || (combined_after_bytes && from == ZV))
- {
- /* Bytes are being combined across the region boundary. We
- should avoid it. We recover the original contents before
- signaling an error. */
- bcopy (XSTRING (deletion)->data, GPT_ADDR, nbytes_del);
- GAP_SIZE -= nbytes_del;
- ZV += nchars_del;
- Z += nchars_del;
- ZV_BYTE += nbytes_del;
- Z_BYTE += nbytes_del;
- GPT = from + nchars_del;
- GPT_BYTE = from_byte + nbytes_del;
- *(GPT_ADDR) = 0; /* Put an anchor. */
- if (markers)
- adjust_markers_for_insert (from, from_byte, to, to_byte, 0, 0, 0);
- UNGCPRO;
- byte_combining_error ();
- GCPRO1 (new);
- }
-
- /* 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)
- {
- Lisp_Object deletion;
- deletion = Qnil;
-
- if (! EQ (current_buffer->undo_list, Qt))
- 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);
- if (! EQ (current_buffer->undo_list, Qt))
- record_delete (from + nchars_del, deletion);
- }
-
- if (combined_before_bytes)
- {
- Lisp_Object deletion;
- deletion = Qnil;
-
- if (! EQ (current_buffer->undo_list, Qt))
- 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);
- if (! EQ (current_buffer->undo_list, Qt))
- record_delete (from - 1, deletion);
- }
+ if (count_combining_before (GPT_ADDR, outgoing_insbytes, from, from_byte)
+ || count_combining_after (GPT_ADDR, outgoing_insbytes, from, from_byte))
+ abort ();
+#endif
if (! EQ (current_buffer->undo_list, Qt))
{
- record_delete (from - !!combined_before_bytes, deletion);
- record_insert (from - !!combined_before_bytes,
- (inschars - combined_before_bytes
- + !!combined_before_bytes));
+ /* Record the insertion first, so that when we undo,
+ the deletion will be undone first. Thus, undo
+ will insert before deleting, and thus will keep
+ the markers before and after this text separate. */
+ record_insert (from + SCHARS (deletion), inschars);
+ record_delete (from, deletion);
}
GAP_SIZE -= 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 the deletion and the insertion. */
if (markers)
- adjust_markers_for_insert (from, from_byte,
- from + inschars, from_byte + outgoing_insbytes,
- combined_before_bytes, combined_after_bytes, 0);
+ adjust_markers_for_replace (from, from_byte, nchars_del, nbytes_del,
+ inschars, outgoing_insbytes);
-#ifdef USE_TEXT_PROPERTIES
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;
+ intervals = STRING_INTERVALS (new);
/* Insert those intervals. */
graft_intervals_into_buffer (intervals, from, inschars,
current_buffer, inherit);
-#endif
/* Relocate point as if it were a marker. */
if (from < PT)
(from_byte + outgoing_insbytes
- (PT_BYTE < to_byte ? PT_BYTE : to_byte)));
- if (combined_after_bytes)
- {
- if (combined_before_bytes == outgoing_insbytes)
- /* This is the case that all new bytes are combined. */
- combined_before_bytes += combined_after_bytes;
- else
- combine_bytes (from + inschars, from_byte + outgoing_insbytes,
- combined_after_bytes);
- }
- if (combined_before_bytes)
- combine_bytes (from, from_byte, combined_before_bytes);
-
- /* As byte combining will decrease Z, we must check this again. */
- if (Z - GPT < END_UNCHANGED)
- END_UNCHANGED = Z - GPT;
-
if (outgoing_insbytes == 0)
evaporate_overlays (from);
CHECK_MARKERS ();
MODIFF++;
+ CHARS_MODIFF = MODIFF;
UNGCPRO;
signal_after_change (from, nchars_del, GPT - from);
+ update_compositions (from, GPT, CHECK_BORDER);
+}
+\f
+/* Replace the text from character positions FROM to TO with
+ the text in INS of length INSCHARS.
+ Keep the text properties that applied to the old characters
+ (extending them to all the new chars if there are more new chars).
+
+ Note that this does not yet handle markers quite right.
+
+ If MARKERS is nonzero, relocate markers.
+
+ Unlike most functions at this level, never call
+ prepare_to_modify_buffer and never call signal_after_change. */
+
+void
+replace_range_2 (from, from_byte, to, to_byte, ins, inschars, insbytes, markers)
+ int from, from_byte, to, to_byte;
+ char *ins;
+ int inschars, insbytes, markers;
+{
+ int nbytes_del, nchars_del;
+ Lisp_Object temp;
+
+ CHECK_MARKERS ();
+
+ nchars_del = to - from;
+ nbytes_del = to_byte - from_byte;
+
+ if (nbytes_del <= 0 && insbytes == 0)
+ return;
+
+ /* 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))
+ error ("Maximum buffer size exceeded");
+
+ /* Make sure the gap is somewhere in or next to what we are deleting. */
+ if (from > GPT)
+ gap_right (from, from_byte);
+ if (to < GPT)
+ gap_left (to, to_byte, 0);
+
+ GAP_SIZE += nbytes_del;
+ ZV -= nchars_del;
+ Z -= nchars_del;
+ ZV_BYTE -= nbytes_del;
+ Z_BYTE -= nbytes_del;
+ GPT = from;
+ GPT_BYTE = from_byte;
+ if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
+
+ if (GPT_BYTE < GPT)
+ abort ();
+
+ 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);
+
+ /* Copy the replacement text into the buffer. */
+ bcopy (ins, GPT_ADDR, insbytes);
+
+#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, insbytes, from, from_byte)
+ || count_combining_after (GPT_ADDR, insbytes, from, from_byte))
+ abort ();
+#endif
+
+ GAP_SIZE -= insbytes;
+ GPT += inschars;
+ ZV += inschars;
+ Z += inschars;
+ GPT_BYTE += insbytes;
+ ZV_BYTE += insbytes;
+ Z_BYTE += insbytes;
+ if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
+
+ if (GPT_BYTE < GPT)
+ abort ();
+
+ /* Adjust the overlay center as needed. This must be done after
+ adjusting the markers that bound the overlays. */
+ if (nchars_del != inschars)
+ {
+ adjust_overlays_for_insert (from, inschars);
+ adjust_overlays_for_delete (from + inschars, nchars_del);
+ }
+
+ /* Adjust markers for the deletion and the insertion. */
+ if (markers
+ && ! (nchars_del == 1 && inschars == 1 && nbytes_del == insbytes))
+ adjust_markers_for_replace (from, from_byte, nchars_del, nbytes_del,
+ inschars, insbytes);
+
+ offset_intervals (current_buffer, from, inschars - nchars_del);
+
+ /* Relocate point as if it were a marker. */
+ if (from < PT && (nchars_del != inschars || nbytes_del != insbytes))
+ {
+ if (PT < to)
+ /* PT was within the deleted text. Move it to FROM. */
+ adjust_point (from - PT, from_byte - PT_BYTE);
+ else
+ adjust_point (inschars - nchars_del, insbytes - nbytes_del);
+ }
+
+ if (insbytes == 0)
+ evaporate_overlays (from);
+
+ CHECK_MARKERS ();
+
+ MODIFF++;
+ CHARS_MODIFF = MODIFF;
}
\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)
{
int range_length = to - from;
prepare_to_modify_buffer (from, to, &from);
- to = from + range_length;
+ to = min (ZV, from + range_length);
}
from_byte = CHAR_TO_BYTE (from);
to_byte = CHAR_TO_BYTE (to);
- del_range_2 (from, from_byte, to, 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. */
if (old_from != from)
from_byte = CHAR_TO_BYTE (from);
- if (old_to == Z - to)
+ if (to > ZV)
+ {
+ to = ZV;
+ to_byte = ZV_BYTE;
+ }
+ else if (old_to == Z - to)
to_byte = CHAR_TO_BYTE (to);
}
- del_range_2 (from, from_byte, to, 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
if (old_from != from)
from_byte = CHAR_TO_BYTE (from);
- if (old_to == Z - to)
+ if (to > ZV)
+ {
+ to = ZV;
+ to_byte = ZV_BYTE;
+ }
+ else if (old_to == Z - to)
to_byte = CHAR_TO_BYTE (to);
}
- del_range_2 (from, from_byte, to, 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, from_byte, to, to_byte)
- int from, from_byte, to, 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;
- int combined_after_bytes;
Lisp_Object deletion;
- int from_byte_1;
CHECK_MARKERS ();
if (to < GPT)
gap_left (to, to_byte, 0);
- combined_after_bytes
- = count_combining_before (BUF_BYTE_ADDRESS (current_buffer, to_byte),
- Z_BYTE - to_byte, from, from_byte);
- if (combined_after_bytes)
- {
- if (from == BEGV || to == ZV)
- byte_combining_error ();
- from_byte_1 = from_byte;
- DEC_POS (from_byte_1);
- }
- else
- from_byte_1 = from_byte;
+#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 (! EQ (current_buffer->undo_list, Qt))
- deletion
- = make_buffer_string_both (from - !!combined_after_bytes,
- from_byte_1,
- to + combined_after_bytes,
- to_byte + combined_after_bytes, 1);
- if (combined_after_bytes)
- /* COMBINED_AFTER_BYTES nonzero means that the above code moved
- the gap. We must move the gap again to a proper place. */
- move_gap_both (from, from_byte);
+ 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);
- 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);
- }
+
if (! EQ (current_buffer->undo_list, Qt))
- record_delete (from - !!combined_after_bytes, deletion);
+ record_delete (from, deletion);
MODIFF++;
+ CHARS_MODIFF = MODIFF;
/* Relocate point as if it were a marker. */
if (from < PT)
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
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 (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
if (GPT_BYTE < GPT)
abort ();
if (Z - GPT < END_UNCHANGED)
END_UNCHANGED = Z - GPT;
- if (combined_after_bytes)
- {
- /* Adjust markers for byte combining. As we have already
- adjuted markers without concerning byte combining, here we
- must concern only byte combining. */
- adjust_markers_for_replace (from, from_byte, 0, 0, 0, 0,
- 0, combined_after_bytes);
- combine_bytes (from, from_byte, combined_after_bytes);
-
- record_insert (GPT - 1, 1);
-
- if (Z - GPT < END_UNCHANGED)
- END_UNCHANGED = Z - GPT;
- }
-
CHECK_MARKERS ();
evaporate_overlays (from);
+
+ return deletion;
}
\f
/* Call this if you're about to change the region of BUFFER from
character positions 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. */
+ area.
+
+ If PRESERVE_CHARS_MODIFF is non-zero, do not update CHARS_MODIFF.
+ Otherwise set CHARS_MODIFF to the new value of MODIFF. */
void
-modify_region (buffer, start, end)
+modify_region (buffer, start, end, preserve_chars_modiff)
struct buffer *buffer;
- int start, end;
+ int start, end, preserve_chars_modiff;
{
struct buffer *old_buffer = current_buffer;
if (MODIFF <= SAVE_MODIFF)
record_first_change ();
MODIFF++;
+ if (! preserve_chars_modiff)
+ CHARS_MODIFF = MODIFF;
buffer->point_before_scroll = Qnil;
int start, end;
int *preserve_ptr;
{
+ struct buffer *base_buffer;
+
if (!NILP (current_buffer->read_only))
Fbarf_if_buffer_read_only ();
if (XBUFFER (XWINDOW (selected_window)->buffer) != current_buffer)
++windows_or_buffers_changed;
- /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
if (BUF_INTERVALS (current_buffer) != 0)
{
if (preserve_ptr)
GCPRO1 (preserve_marker);
verify_interval_modification (current_buffer, start, end);
*preserve_ptr = marker_position (preserve_marker);
- unchain_marker (preserve_marker);
+ unchain_marker (XMARKER (preserve_marker));
UNGCPRO;
}
else
verify_interval_modification (current_buffer, start, end);
}
+ /* For indirect buffers, use the base buffer to check clashes. */
+ if (current_buffer->base_buffer != 0)
+ base_buffer = current_buffer->base_buffer;
+ else
+ base_buffer = current_buffer;
+
#ifdef CLASH_DETECTION
- if (!NILP (current_buffer->file_truename)
+ if (!NILP (base_buffer->file_truename)
/* Make binding buffer-file-name to nil effective. */
- && !NILP (current_buffer->filename)
+ && !NILP (base_buffer->filename)
&& SAVE_MODIFF >= MODIFF)
- lock_file (current_buffer->file_truename);
+ lock_file (base_buffer->file_truename);
#else
/* At least warn if this file has changed on disk since it was visited. */
- if (!NILP (current_buffer->filename)
+ if (!NILP (base_buffer->filename)
&& SAVE_MODIFF >= MODIFF
&& NILP (Fverify_visited_file_modtime (Fcurrent_buffer ()))
- && !NILP (Ffile_exists_p (current_buffer->filename)))
+ && !NILP (Ffile_exists_p (base_buffer->filename)))
call1 (intern ("ask-user-about-supersession-threat"),
- current_buffer->filename);
+ base_buffer->filename);
#endif /* not CLASH_DETECTION */
signal_before_change (start, end, preserve_ptr);
if (! NILP (preserve_marker)) \
{ \
*preserve_ptr = marker_position (preserve_marker); \
- unchain_marker (preserve_marker); \
+ unchain_marker (XMARKER (preserve_marker)); \
}
#define PRESERVE_START_END \
#define FETCH_END \
(! NILP (end_marker) ? Fmarker_position (end_marker) : end)
+/* Set a variable to nil if an error occurred.
+ Don't change the variable if there was no error.
+ VAL is a cons-cell (VARIABLE . NO-ERROR-FLAG).
+ VARIABLE is the variable to maybe set to nil.
+ NO-ERROR-FLAG is nil if there was an error,
+ anything else meaning no error (so this function does nothing). */
+Lisp_Object
+reset_var_on_error (val)
+ Lisp_Object val;
+{
+ if (NILP (XCDR (val)))
+ Fset (XCAR (val), Qnil);
+ return Qnil;
+}
+
/* Signal a change to the buffer immediately before it happens.
START_INT and END_INT are the bounds of the text to be changed.
Lisp_Object start_marker, end_marker;
Lisp_Object preserve_marker;
struct gcpro gcpro1, gcpro2, gcpro3;
+ int count = SPECPDL_INDEX ();
if (inhibit_modification_hooks)
return;
end_marker = Qnil;
GCPRO3 (preserve_marker, start_marker, end_marker);
+ specbind (Qinhibit_modification_hooks, Qt);
+
/* If buffer is unmodified, run a special hook for that case. */
if (SAVE_MODIFF >= MODIFF
&& !NILP (Vfirst_change_hook)
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))
{
Lisp_Object args[3];
- Lisp_Object before_change_functions;
- Lisp_Object after_change_functions;
- struct gcpro gcpro1, gcpro2;
+ Lisp_Object rvoe_arg = Fcons (Qbefore_change_functions, Qnil);
PRESERVE_VALUE;
PRESERVE_START_END;
- /* "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;
- Vbefore_change_functions = Qnil;
- Vafter_change_functions = Qnil;
- GCPRO2 (before_change_functions, after_change_functions);
+ /* Mark before-change-functions to be reset to nil in case of error. */
+ record_unwind_protect (reset_var_on_error, rvoe_arg);
/* Actually run the hook functions. */
args[0] = Qbefore_change_functions;
args[1] = FETCH_START;
args[2] = FETCH_END;
- run_hook_list_with_args (before_change_functions, 3, args);
+ Frun_hook_with_args (3, args);
- /* "Unbind" the variables we "bound" to nil. */
- Vbefore_change_functions = before_change_functions;
- Vafter_change_functions = after_change_functions;
- UNGCPRO;
+ /* There was no error: unarm the reset_on_error. */
+ XSETCDR (rvoe_arg, Qt);
}
- if (!NILP (current_buffer->overlays_before)
- || !NILP (current_buffer->overlays_after))
+ if (current_buffer->overlays_before || current_buffer->overlays_after)
{
PRESERVE_VALUE;
report_overlay_modification (FETCH_START, FETCH_END, 0,
free_marker (end_marker);
RESTORE_VALUE;
UNGCPRO;
+
+ unbind_to (count, Qnil);
}
/* Signal a change immediately after it happens.
signal_after_change (charpos, lendel, lenins)
int charpos, lendel, lenins;
{
+ int count = SPECPDL_INDEX ();
if (inhibit_modification_hooks)
return;
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))
+ && NILP (Vbefore_change_functions)
+ && !current_buffer->overlays_before
+ && !current_buffer->overlays_after)
{
Lisp_Object elt;
return;
}
- if (!NILP (combine_after_change_list))
+ 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));
+ specbind (Qinhibit_modification_hooks, Qt);
if (!NILP (Vafter_change_functions))
{
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;
- Vbefore_change_functions = Qnil;
- Vafter_change_functions = Qnil;
- GCPRO2 (before_change_functions, after_change_functions);
+ Lisp_Object rvoe_arg = Fcons (Qafter_change_functions, Qnil);
+
+ /* Mark after-change-functions to be reset to nil in case of error. */
+ record_unwind_protect (reset_var_on_error, rvoe_arg);
/* Actually run the hook functions. */
args[0] = Qafter_change_functions;
XSETFASTINT (args[1], charpos);
XSETFASTINT (args[2], charpos + lenins);
XSETFASTINT (args[3], lendel);
- run_hook_list_with_args (after_change_functions,
- 4, args);
+ Frun_hook_with_args (4, args);
- /* "Unbind" the variables we "bound" to nil. */
- Vbefore_change_functions = before_change_functions;
- Vafter_change_functions = after_change_functions;
- UNGCPRO;
+ /* There was no error: unarm the reset_on_error. */
+ XSETCDR (rvoe_arg, Qt);
}
- if (!NILP (current_buffer->overlays_before)
- || !NILP (current_buffer->overlays_after))
+ if (current_buffer->overlays_before || current_buffer->overlays_after)
report_overlay_modification (make_number (charpos),
make_number (charpos + lenins),
1,
if (lendel == 0)
report_interval_modification (make_number (charpos),
make_number (charpos + lenins));
+
+ unbind_to (count, Qnil);
}
Lisp_Object
}
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'.")
- ()
+ Scombine_after_change_execute, 0, 0, 0,
+ doc: /* This function is for use internally in `combine-after-change-calls'. */)
+ ()
{
- int count = specpdl_ptr - specpdl;
+ int count = SPECPDL_INDEX ();
int beg, end, change;
int begpos, endpos;
Lisp_Object tail;
if (NILP (combine_after_change_list))
return Qnil;
+ /* It is rare for combine_after_change_buffer to be invalid, but
+ possible. It can happen when combine-after-change-calls is
+ non-nil, and insertion calls a file handler (e.g. through
+ lock_file) which scribbles into a temp file -- cyd */
+ if (!BUFFERP (combine_after_change_buffer)
+ || NILP (XBUFFER (combine_after_change_buffer)->name))
+ {
+ combine_after_change_list = Qnil;
+ return Qnil;
+ }
+
record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
Fset_buffer (combine_after_change_buffer);
that was changed. */
begpos = BEG + beg;
endpos = Z - end;
-
+
/* We are about to handle these, so discard them. */
combine_after_change_list = Qnil;
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, Qnil);
}
syms_of_insdel ()
{
staticpro (&combine_after_change_list);
+ staticpro (&combine_after_change_buffer);
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.");
+ doc: /* 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.");
+ doc: /* 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.");
+ doc: /* Non-nil means don't run any of the hooks that respond to buffer changes.
+This affects `before-change-functions' and `after-change-functions',
+as well as hooks attached to text properties and overlays. */);
inhibit_modification_hooks = 0;
+ Qinhibit_modification_hooks = intern ("inhibit-modification-hooks");
+ staticpro (&Qinhibit_modification_hooks);
defsubr (&Scombine_after_change_execute);
}
+
+/* arch-tag: 9b34b886-47d7-465e-a234-299af411b23d
+ (do not change this comment) */
HCoop / bpt / emacs.git / blobdiff