/* Buffer insertion/deletion and gap motion for GNU Emacs.
- Copyright (C) 1985-1986, 1993-1995, 1997-2011
+ Copyright (C) 1985-1986, 1993-1995, 1997-2012
Free Software Foundation, Inc.
This file is part of GNU Emacs.
#include "lisp.h"
#include "intervals.h"
-#include "buffer.h"
#include "character.h"
+#include "buffer.h"
#include "window.h"
#include "blockinput.h"
#include "region-cache.h"
-#ifndef NULL
-#define NULL 0
-#endif
-
static void insert_from_string_1 (Lisp_Object string,
- EMACS_INT pos, EMACS_INT pos_byte,
- EMACS_INT nchars, EMACS_INT nbytes,
+ ptrdiff_t pos, ptrdiff_t pos_byte,
+ ptrdiff_t nchars, ptrdiff_t nbytes,
int inherit, int before_markers);
static void insert_from_buffer_1 (struct buffer *buf,
- EMACS_INT from, EMACS_INT nchars,
+ ptrdiff_t from, ptrdiff_t nchars,
int inherit);
-static void gap_left (EMACS_INT charpos, EMACS_INT bytepos, int newgap);
-static void gap_right (EMACS_INT charpos, EMACS_INT bytepos);
-
-static Lisp_Object Fcombine_after_change_execute (void);
+static void gap_left (ptrdiff_t charpos, ptrdiff_t bytepos, int newgap);
+static void gap_right (ptrdiff_t charpos, ptrdiff_t bytepos);
/* List of elements of the form (BEG-UNCHANGED END-UNCHANGED CHANGE-AMOUNT)
describing changes which happened while combine_after_change_calls
Lisp_Object Qinhibit_modification_hooks;
-static void signal_before_change (EMACS_INT, EMACS_INT, EMACS_INT *);
-\f
-#define CHECK_MARKERS() \
- do \
- { \
- if (check_markers_debug_flag) \
- check_markers (); \
- } \
- while (0)
+static void signal_before_change (ptrdiff_t, ptrdiff_t, ptrdiff_t *);
+
+/* Also used in marker.c to enable expensive marker checks. */
+
+#ifdef MARKER_DEBUG
static void
check_markers (void)
abort ();
}
}
-\f
+
+#else /* not MARKER_DEBUG */
+
+#define check_markers() do { } while (0)
+
+#endif /* MARKER_DEBUG */
+
/* Move gap to position CHARPOS.
Note that this can quit! */
void
-move_gap (EMACS_INT charpos)
+move_gap (ptrdiff_t charpos)
{
move_gap_both (charpos, charpos_to_bytepos (charpos));
}
Note that this can quit! */
void
-move_gap_both (EMACS_INT charpos, EMACS_INT bytepos)
+move_gap_both (ptrdiff_t charpos, ptrdiff_t bytepos)
{
if (bytepos < GPT_BYTE)
gap_left (charpos, bytepos, 0);
If NEWGAP is nonzero, then don't update beg_unchanged and end_unchanged. */
static void
-gap_left (EMACS_INT charpos, EMACS_INT bytepos, int newgap)
+gap_left (ptrdiff_t charpos, ptrdiff_t bytepos, int newgap)
{
register unsigned char *to, *from;
- register EMACS_INT i;
- EMACS_INT new_s1;
+ register ptrdiff_t i;
+ ptrdiff_t new_s1;
if (!newgap)
BUF_COMPUTE_UNCHANGED (current_buffer, charpos, GPT);
was specified or may be where a quit was detected. */
GPT_BYTE = bytepos;
GPT = charpos;
- if (bytepos < charpos)
- abort ();
+ eassert (charpos <= bytepos);
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
QUIT;
}
and CHARPOS is the corresponding char position. */
static void
-gap_right (EMACS_INT charpos, EMACS_INT bytepos)
+gap_right (ptrdiff_t charpos, ptrdiff_t bytepos)
{
register unsigned char *to, *from;
- register EMACS_INT i;
- EMACS_INT new_s1;
+ register ptrdiff_t i;
+ ptrdiff_t new_s1;
BUF_COMPUTE_UNCHANGED (current_buffer, charpos, GPT);
GPT = charpos;
GPT_BYTE = bytepos;
- if (bytepos < charpos)
- abort ();
+ eassert (charpos <= bytepos);
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
QUIT;
}
or inside of the range being deleted. */
void
-adjust_markers_for_delete (EMACS_INT from, EMACS_INT from_byte,
- EMACS_INT to, EMACS_INT to_byte)
+adjust_markers_for_delete (ptrdiff_t from, ptrdiff_t from_byte,
+ ptrdiff_t to, ptrdiff_t to_byte)
{
Lisp_Object marker;
register struct Lisp_Marker *m;
- register EMACS_INT charpos;
+ register ptrdiff_t charpos;
for (m = BUF_MARKERS (current_buffer); m; m = m->next)
{
charpos = m->charpos;
-
- if (charpos > Z)
- abort ();
+ eassert (charpos <= Z);
/* If the marker is after the deletion,
relocate by number of chars / bytes deleted. */
or BEFORE_MARKERS is true. */
static void
-adjust_markers_for_insert (EMACS_INT from, EMACS_INT from_byte,
- EMACS_INT to, EMACS_INT to_byte, int before_markers)
+adjust_markers_for_insert (ptrdiff_t from, ptrdiff_t from_byte,
+ ptrdiff_t to, ptrdiff_t to_byte, int before_markers)
{
struct Lisp_Marker *m;
int adjusted = 0;
- EMACS_INT nchars = to - from;
- EMACS_INT nbytes = to_byte - from_byte;
+ ptrdiff_t nchars = to - from;
+ ptrdiff_t nbytes = to_byte - from_byte;
for (m = BUF_MARKERS (current_buffer); m; m = m->next)
{
intervals. */
static void
-adjust_point (EMACS_INT nchars, EMACS_INT nbytes)
+adjust_point (ptrdiff_t nchars, ptrdiff_t nbytes)
{
SET_BUF_PT_BOTH (current_buffer, PT + nchars, PT_BYTE + nbytes);
/* In a single-byte buffer, the two positions must be equal. */
an insertion. */
static void
-adjust_markers_for_replace (EMACS_INT from, EMACS_INT from_byte,
- EMACS_INT old_chars, EMACS_INT old_bytes,
- EMACS_INT new_chars, EMACS_INT new_bytes)
+adjust_markers_for_replace (ptrdiff_t from, ptrdiff_t from_byte,
+ ptrdiff_t old_chars, ptrdiff_t old_bytes,
+ ptrdiff_t new_chars, ptrdiff_t new_bytes)
{
register struct Lisp_Marker *m;
- EMACS_INT prev_to_byte = from_byte + old_bytes;
- EMACS_INT diff_chars = new_chars - old_chars;
- EMACS_INT diff_bytes = new_bytes - old_bytes;
+ ptrdiff_t prev_to_byte = from_byte + old_bytes;
+ ptrdiff_t diff_chars = new_chars - old_chars;
+ ptrdiff_t diff_bytes = new_bytes - old_bytes;
for (m = BUF_MARKERS (current_buffer); m; m = m->next)
{
}
}
- CHECK_MARKERS ();
+ check_markers ();
}
\f
/* Make the gap NBYTES_ADDED bytes longer. */
static void
-make_gap_larger (EMACS_INT nbytes_added)
+make_gap_larger (ptrdiff_t nbytes_added)
{
Lisp_Object tem;
- EMACS_INT real_gap_loc;
- EMACS_INT real_gap_loc_byte;
- EMACS_INT old_gap_size;
- EMACS_INT current_size = Z_BYTE - BEG_BYTE + GAP_SIZE;
+ ptrdiff_t real_gap_loc;
+ ptrdiff_t real_gap_loc_byte;
+ ptrdiff_t old_gap_size;
+ ptrdiff_t current_size = Z_BYTE - BEG_BYTE + GAP_SIZE;
enum { enough_for_a_while = 2000 };
if (BUF_BYTES_MAX - current_size < nbytes_added)
/* Make the gap NBYTES_REMOVED bytes shorter. */
static void
-make_gap_smaller (EMACS_INT nbytes_removed)
+make_gap_smaller (ptrdiff_t nbytes_removed)
{
Lisp_Object tem;
- EMACS_INT real_gap_loc;
- EMACS_INT real_gap_loc_byte;
- EMACS_INT real_Z;
- EMACS_INT real_Z_byte;
- EMACS_INT real_beg_unchanged;
- EMACS_INT new_gap_size;
+ ptrdiff_t real_gap_loc;
+ ptrdiff_t real_gap_loc_byte;
+ ptrdiff_t real_Z;
+ ptrdiff_t real_Z_byte;
+ ptrdiff_t real_beg_unchanged;
+ ptrdiff_t new_gap_size;
/* Make sure the gap is at least 20 bytes. */
if (GAP_SIZE - nbytes_removed < 20)
#endif /* USE_MMAP_FOR_BUFFERS || REL_ALLOC || DOUG_LEA_MALLOC */
void
-make_gap (EMACS_INT nbytes_added)
+make_gap (ptrdiff_t nbytes_added)
{
if (nbytes_added >= 0)
make_gap_larger (nbytes_added);
Return the number of bytes stored at TO_ADDR. */
-EMACS_INT
+ptrdiff_t
copy_text (const unsigned char *from_addr, unsigned char *to_addr,
- EMACS_INT nbytes, int from_multibyte, int to_multibyte)
+ ptrdiff_t nbytes, int from_multibyte, int to_multibyte)
{
if (from_multibyte == to_multibyte)
{
}
else if (from_multibyte)
{
- EMACS_INT nchars = 0;
- EMACS_INT bytes_left = nbytes;
+ ptrdiff_t nchars = 0;
+ ptrdiff_t bytes_left = nbytes;
while (bytes_left > 0)
{
prepare_to_modify_buffer could relocate the text. */
void
-insert (const char *string, EMACS_INT nbytes)
+insert (const char *string, ptrdiff_t nbytes)
{
if (nbytes > 0)
{
- EMACS_INT len = chars_in_text ((unsigned char *) string, nbytes), opoint;
+ ptrdiff_t len = chars_in_text ((unsigned char *) string, nbytes), opoint;
insert_1_both (string, len, nbytes, 0, 1, 0);
opoint = PT - len;
signal_after_change (opoint, 0, len);
/* Likewise, but inherit text properties from neighboring characters. */
void
-insert_and_inherit (const char *string, EMACS_INT nbytes)
+insert_and_inherit (const char *string, ptrdiff_t nbytes)
{
if (nbytes > 0)
{
- EMACS_INT len = chars_in_text ((unsigned char *) string, nbytes), opoint;
+ ptrdiff_t len = chars_in_text ((unsigned char *) string, nbytes), opoint;
insert_1_both (string, len, nbytes, 1, 1, 0);
opoint = PT - len;
signal_after_change (opoint, 0, len);
since gc could happen and relocate it. */
void
-insert_before_markers (const char *string, EMACS_INT nbytes)
+insert_before_markers (const char *string, ptrdiff_t nbytes)
{
if (nbytes > 0)
{
- EMACS_INT len = chars_in_text ((unsigned char *) string, nbytes), opoint;
+ ptrdiff_t len = chars_in_text ((unsigned char *) string, nbytes), opoint;
insert_1_both (string, len, nbytes, 0, 1, 1);
opoint = PT - len;
signal_after_change (opoint, 0, len);
void
insert_before_markers_and_inherit (const char *string,
- EMACS_INT nbytes)
+ ptrdiff_t nbytes)
{
if (nbytes > 0)
{
- EMACS_INT len = chars_in_text ((unsigned char *) string, nbytes), opoint;
+ ptrdiff_t len = chars_in_text ((unsigned char *) string, nbytes), opoint;
insert_1_both (string, len, nbytes, 1, 1, 1);
opoint = PT - len;
signal_after_change (opoint, 0, len);
/* Subroutine used by the insert functions above. */
void
-insert_1 (const char *string, EMACS_INT nbytes,
+insert_1 (const char *string, ptrdiff_t nbytes,
int inherit, int prepare, int before_markers)
{
insert_1_both (string, chars_in_text ((unsigned char *) string, nbytes),
which combine in this way. Otherwise, return 0. */
int
-count_combining_before (const unsigned char *string, EMACS_INT length,
- EMACS_INT pos, EMACS_INT pos_byte)
+count_combining_before (const unsigned char *string, ptrdiff_t length,
+ ptrdiff_t pos, ptrdiff_t pos_byte)
{
int len, combining_bytes;
const unsigned char *p;
int
count_combining_after (const unsigned char *string,
- EMACS_INT length, EMACS_INT pos, EMACS_INT pos_byte)
+ ptrdiff_t length, ptrdiff_t pos, ptrdiff_t pos_byte)
{
- EMACS_INT opos_byte = pos_byte;
- EMACS_INT i;
- EMACS_INT bytes;
+ ptrdiff_t opos_byte = pos_byte;
+ ptrdiff_t i;
+ ptrdiff_t bytes;
unsigned char *bufp;
if (NILP (current_buffer->enable_multibyte_characters))
void
insert_1_both (const char *string,
- EMACS_INT nchars, EMACS_INT nbytes,
+ ptrdiff_t nchars, ptrdiff_t nbytes,
int inherit, int prepare, int before_markers)
{
if (nchars == 0)
Z_BYTE += nbytes;
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
- if (GPT_BYTE < GPT)
- abort ();
+ eassert (GPT <= GPT_BYTE);
/* The insert may have been in the unchanged region, so check again. */
if (Z - GPT < END_UNCHANGED)
PT + nchars, PT_BYTE + nbytes,
before_markers);
- if (BUF_INTERVALS (current_buffer) != 0)
+ if (buffer_get_intervals (current_buffer))
offset_intervals (current_buffer, PT, nchars);
- if (!inherit && BUF_INTERVALS (current_buffer) != 0)
+ if (!inherit && buffer_get_intervals (current_buffer))
set_text_properties (make_number (PT), make_number (PT + nchars),
Qnil, Qnil, Qnil);
adjust_point (nchars, nbytes);
- CHECK_MARKERS ();
+ check_markers ();
}
\f
/* Insert the part of the text of STRING, a Lisp object assumed to be
without insert noticing. */
void
-insert_from_string (Lisp_Object string, EMACS_INT pos, EMACS_INT pos_byte,
- EMACS_INT length, EMACS_INT length_byte, int inherit)
+insert_from_string (Lisp_Object string, ptrdiff_t pos, ptrdiff_t pos_byte,
+ ptrdiff_t length, ptrdiff_t length_byte, int inherit)
{
- EMACS_INT opoint = PT;
+ ptrdiff_t opoint = PT;
if (SCHARS (string) == 0)
return;
void
insert_from_string_before_markers (Lisp_Object string,
- EMACS_INT pos, EMACS_INT pos_byte,
- EMACS_INT length, EMACS_INT length_byte,
+ ptrdiff_t pos, ptrdiff_t pos_byte,
+ ptrdiff_t length, ptrdiff_t length_byte,
int inherit)
{
- EMACS_INT opoint = PT;
+ ptrdiff_t opoint = PT;
if (SCHARS (string) == 0)
return;
/* Subroutine of the insertion functions above. */
static void
-insert_from_string_1 (Lisp_Object string, EMACS_INT pos, EMACS_INT pos_byte,
- EMACS_INT nchars, EMACS_INT nbytes,
+insert_from_string_1 (Lisp_Object string, ptrdiff_t pos, ptrdiff_t pos_byte,
+ ptrdiff_t nchars, ptrdiff_t nbytes,
int inherit, int before_markers)
{
struct gcpro gcpro1;
- EMACS_INT outgoing_nbytes = nbytes;
+ ptrdiff_t outgoing_nbytes = nbytes;
INTERVAL intervals;
/* Make OUTGOING_NBYTES describe the text
Z_BYTE += outgoing_nbytes;
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
- if (GPT_BYTE < GPT)
- abort ();
+ eassert (GPT <= GPT_BYTE);
/* The insert may have been in the unchanged region, so check again. */
if (Z - GPT < END_UNCHANGED)
offset_intervals (current_buffer, PT, nchars);
- intervals = STRING_INTERVALS (string);
+ intervals = string_get_intervals (string);
/* Get the intervals for the part of the string we are inserting. */
if (nbytes < SBYTES (string))
intervals = copy_intervals (intervals, pos, nchars);
adjust_point (nchars, outgoing_nbytes);
- CHECK_MARKERS ();
+ check_markers ();
}
\f
/* Insert a sequence of NCHARS chars which occupy NBYTES bytes
starting at GPT_ADDR. */
void
-insert_from_gap (EMACS_INT nchars, EMACS_INT nbytes)
+insert_from_gap (ptrdiff_t nchars, ptrdiff_t nbytes)
{
if (NILP (BVAR (current_buffer, enable_multibyte_characters)))
nchars = nbytes;
Z_BYTE += nbytes;
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
- if (GPT_BYTE < GPT)
- abort ();
+ eassert (GPT <= GPT_BYTE);
adjust_overlays_for_insert (GPT - nchars, nchars);
adjust_markers_for_insert (GPT - nchars, GPT_BYTE - nbytes,
GPT, GPT_BYTE, 0);
- if (BUF_INTERVALS (current_buffer) != 0)
+ if (buffer_get_intervals (current_buffer))
{
offset_intervals (current_buffer, GPT - nchars, nchars);
- graft_intervals_into_buffer (NULL_INTERVAL, GPT - nchars, nchars,
+ graft_intervals_into_buffer (NULL, GPT - nchars, nchars,
current_buffer, 0);
}
if (GPT - nchars < PT)
adjust_point (nchars, nbytes);
- CHECK_MARKERS ();
+ check_markers ();
}
\f
/* Insert text from BUF, NCHARS characters starting at CHARPOS, into the
void
insert_from_buffer (struct buffer *buf,
- EMACS_INT charpos, EMACS_INT nchars, int inherit)
+ ptrdiff_t charpos, ptrdiff_t nchars, int inherit)
{
- EMACS_INT opoint = PT;
+ ptrdiff_t opoint = PT;
insert_from_buffer_1 (buf, charpos, nchars, inherit);
signal_after_change (opoint, 0, PT - opoint);
static void
insert_from_buffer_1 (struct buffer *buf,
- EMACS_INT from, EMACS_INT nchars, int inherit)
+ ptrdiff_t from, ptrdiff_t nchars, int inherit)
{
- EMACS_INT chunk, chunk_expanded;
- EMACS_INT from_byte = buf_charpos_to_bytepos (buf, from);
- EMACS_INT to_byte = buf_charpos_to_bytepos (buf, from + nchars);
- EMACS_INT incoming_nbytes = to_byte - from_byte;
- EMACS_INT outgoing_nbytes = incoming_nbytes;
+ ptrdiff_t chunk, chunk_expanded;
+ ptrdiff_t from_byte = buf_charpos_to_bytepos (buf, from);
+ ptrdiff_t to_byte = buf_charpos_to_bytepos (buf, from + nchars);
+ ptrdiff_t incoming_nbytes = to_byte - from_byte;
+ ptrdiff_t outgoing_nbytes = incoming_nbytes;
INTERVAL intervals;
/* Make OUTGOING_NBYTES describe the text
outgoing_nbytes = nchars;
else if (NILP (BVAR (buf, enable_multibyte_characters)))
{
- EMACS_INT outgoing_before_gap = 0;
- EMACS_INT outgoing_after_gap = 0;
+ ptrdiff_t outgoing_before_gap = 0;
+ ptrdiff_t outgoing_after_gap = 0;
if (from < BUF_GPT (buf))
{
Z_BYTE += outgoing_nbytes;
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
- if (GPT_BYTE < GPT)
- abort ();
+ eassert (GPT <= GPT_BYTE);
/* The insert may have been in the unchanged region, so check again. */
if (Z - GPT < END_UNCHANGED)
PT_BYTE + outgoing_nbytes,
0);
- if (BUF_INTERVALS (current_buffer) != 0)
+ if (buffer_get_intervals (current_buffer))
offset_intervals (current_buffer, PT, nchars);
/* Get the intervals for the part of the string we are inserting. */
- intervals = BUF_INTERVALS (buf);
+ intervals = buffer_get_intervals (buf);
if (nchars < BUF_Z (buf) - BUF_BEG (buf))
{
if (buf == current_buffer && PT <= from)
PREV_TEXT nil means the new text was just inserted. */
static void
-adjust_after_replace (EMACS_INT from, EMACS_INT from_byte,
- Lisp_Object prev_text, EMACS_INT len, EMACS_INT len_byte)
+adjust_after_replace (ptrdiff_t from, ptrdiff_t from_byte,
+ Lisp_Object prev_text, ptrdiff_t len, ptrdiff_t len_byte)
{
- EMACS_INT nchars_del = 0, nbytes_del = 0;
+ ptrdiff_t nchars_del = 0, nbytes_del = 0;
#ifdef BYTE_COMBINING_DEBUG
if (count_combining_before (GPT_ADDR, len_byte, from, from_byte)
adjust_overlays_for_insert (from, len - nchars_del);
else if (len < nchars_del)
adjust_overlays_for_delete (from, nchars_del - len);
- if (BUF_INTERVALS (current_buffer) != 0)
- {
- offset_intervals (current_buffer, from, len - nchars_del);
- }
+
+ if (buffer_get_intervals (current_buffer))
+ offset_intervals (current_buffer, from, len - nchars_del);
if (from < PT)
adjust_point (len - nchars_del, len_byte - nbytes_del);
if (Z - GPT < END_UNCHANGED)
END_UNCHANGED = Z - GPT;
- CHECK_MARKERS ();
+ check_markers ();
if (len == 0)
evaporate_overlays (from);
- FROM) may be incorrect, the correct length is NEWLEN. */
void
-adjust_after_insert (EMACS_INT from, EMACS_INT from_byte,
- EMACS_INT to, EMACS_INT to_byte, EMACS_INT newlen)
+adjust_after_insert (ptrdiff_t from, ptrdiff_t from_byte,
+ ptrdiff_t to, ptrdiff_t to_byte, ptrdiff_t newlen)
{
- EMACS_INT len = to - from, len_byte = to_byte - from_byte;
+ ptrdiff_t len = to - from, len_byte = to_byte - from_byte;
if (GPT != to)
move_gap_both (to, to_byte);
But if MARKERS is 0, don't relocate markers. */
void
-replace_range (EMACS_INT from, EMACS_INT to, Lisp_Object new,
+replace_range (ptrdiff_t from, ptrdiff_t to, Lisp_Object new,
int prepare, int inherit, int markers)
{
- EMACS_INT inschars = SCHARS (new);
- EMACS_INT insbytes = SBYTES (new);
- EMACS_INT from_byte, to_byte;
- EMACS_INT nbytes_del, nchars_del;
+ ptrdiff_t inschars = SCHARS (new);
+ ptrdiff_t insbytes = SBYTES (new);
+ ptrdiff_t from_byte, to_byte;
+ ptrdiff_t nbytes_del, nchars_del;
struct gcpro gcpro1;
INTERVAL intervals;
- EMACS_INT outgoing_insbytes = insbytes;
+ ptrdiff_t outgoing_insbytes = insbytes;
Lisp_Object deletion;
- CHECK_MARKERS ();
+ check_markers ();
GCPRO1 (new);
deletion = Qnil;
if (prepare)
{
- EMACS_INT range_length = to - from;
+ ptrdiff_t range_length = to - from;
prepare_to_modify_buffer (from, to, &from);
to = from + range_length;
}
UNGCPRO;
- /* Make args be valid */
+ /* Make args be valid. */
if (from < BEGV)
from = BEGV;
if (to > ZV)
GPT_BYTE = from_byte;
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
- if (GPT_BYTE < GPT)
- abort ();
+ eassert (GPT <= GPT_BYTE);
if (GPT - BEG < BEG_UNCHANGED)
BEG_UNCHANGED = GPT - BEG;
Z_BYTE += outgoing_insbytes;
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
- if (GPT_BYTE < GPT)
- abort ();
+ eassert (GPT <= GPT_BYTE);
/* Adjust the overlay center as needed. This must be done after
adjusting the markers that bound the overlays. */
/* Get the intervals for the part of the string we are inserting--
not including the combined-before bytes. */
- intervals = STRING_INTERVALS (new);
+ intervals = string_get_intervals (new);
/* Insert those intervals. */
graft_intervals_into_buffer (intervals, from, inschars,
current_buffer, inherit);
if (outgoing_insbytes == 0)
evaporate_overlays (from);
- CHECK_MARKERS ();
+ check_markers ();
MODIFF++;
CHARS_MODIFF = MODIFF;
prepare_to_modify_buffer and never call signal_after_change. */
void
-replace_range_2 (EMACS_INT from, EMACS_INT from_byte,
- EMACS_INT to, EMACS_INT to_byte,
- const char *ins, EMACS_INT inschars, EMACS_INT insbytes,
+replace_range_2 (ptrdiff_t from, ptrdiff_t from_byte,
+ ptrdiff_t to, ptrdiff_t to_byte,
+ const char *ins, ptrdiff_t inschars, ptrdiff_t insbytes,
int markers)
{
- EMACS_INT nbytes_del, nchars_del;
+ ptrdiff_t nbytes_del, nchars_del;
- CHECK_MARKERS ();
+ check_markers ();
nchars_del = to - from;
nbytes_del = to_byte - from_byte;
GPT_BYTE = from_byte;
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
- if (GPT_BYTE < GPT)
- abort ();
+ eassert (GPT <= GPT_BYTE);
if (GPT - BEG < BEG_UNCHANGED)
BEG_UNCHANGED = GPT - BEG;
Z_BYTE += insbytes;
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
- if (GPT_BYTE < GPT)
- abort ();
+ eassert (GPT <= GPT_BYTE);
/* Adjust the overlay center as needed. This must be done after
adjusting the markers that bound the overlays. */
if (insbytes == 0)
evaporate_overlays (from);
- CHECK_MARKERS ();
+ check_markers ();
MODIFF++;
CHARS_MODIFF = MODIFF;
If TO comes before FROM, we delete nothing. */
void
-del_range (EMACS_INT from, EMACS_INT to)
+del_range (ptrdiff_t from, ptrdiff_t to)
{
del_range_1 (from, to, 1, 0);
}
RET_STRING says to return the deleted text. */
Lisp_Object
-del_range_1 (EMACS_INT from, EMACS_INT to, int prepare, int ret_string)
+del_range_1 (ptrdiff_t from, ptrdiff_t to, int prepare, int ret_string)
{
- EMACS_INT from_byte, to_byte;
+ ptrdiff_t from_byte, to_byte;
Lisp_Object deletion;
struct gcpro gcpro1;
if (prepare)
{
- EMACS_INT range_length = to - from;
+ ptrdiff_t range_length = to - from;
prepare_to_modify_buffer (from, to, &from);
to = min (ZV, from + range_length);
}
/* Like del_range_1 but args are byte positions, not char positions. */
void
-del_range_byte (EMACS_INT from_byte, EMACS_INT to_byte, int prepare)
+del_range_byte (ptrdiff_t from_byte, ptrdiff_t to_byte, int prepare)
{
- EMACS_INT from, to;
+ ptrdiff_t from, to;
/* Make args be valid */
if (from_byte < BEGV_BYTE)
if (prepare)
{
- EMACS_INT old_from = from, old_to = Z - to;
- EMACS_INT range_length = to - from;
+ ptrdiff_t old_from = from, old_to = Z - to;
+ ptrdiff_t range_length = to - from;
prepare_to_modify_buffer (from, to, &from);
to = from + range_length;
and bytepos. */
void
-del_range_both (EMACS_INT from, EMACS_INT from_byte,
- EMACS_INT to, EMACS_INT to_byte, int prepare)
+del_range_both (ptrdiff_t from, ptrdiff_t from_byte,
+ ptrdiff_t to, ptrdiff_t to_byte, int prepare)
{
/* Make args be valid */
if (from_byte < BEGV_BYTE)
if (prepare)
{
- EMACS_INT old_from = from, old_to = Z - to;
- EMACS_INT range_length = to - from;
+ ptrdiff_t old_from = from, old_to = Z - to;
+ ptrdiff_t range_length = to - from;
prepare_to_modify_buffer (from, to, &from);
to = from + range_length;
If RET_STRING is true, the deleted area is returned as a string. */
Lisp_Object
-del_range_2 (EMACS_INT from, EMACS_INT from_byte,
- EMACS_INT to, EMACS_INT to_byte, int ret_string)
+del_range_2 (ptrdiff_t from, ptrdiff_t from_byte,
+ ptrdiff_t to, ptrdiff_t to_byte, int ret_string)
{
- register EMACS_INT nbytes_del, nchars_del;
+ register ptrdiff_t nbytes_del, nchars_del;
Lisp_Object deletion;
- CHECK_MARKERS ();
+ check_markers ();
nchars_del = to - from;
nbytes_del = to_byte - from_byte;
needs to access the previous gap contents. */
*(GPT_ADDR) = 0;
- if (GPT_BYTE < GPT)
- abort ();
+ eassert (GPT <= GPT_BYTE);
if (GPT - BEG < BEG_UNCHANGED)
BEG_UNCHANGED = GPT - BEG;
if (Z - GPT < END_UNCHANGED)
END_UNCHANGED = Z - GPT;
- CHECK_MARKERS ();
+ check_markers ();
evaporate_overlays (from);
Otherwise set CHARS_MODIFF to the new value of MODIFF. */
void
-modify_region (struct buffer *buffer, EMACS_INT start, EMACS_INT end,
+modify_region (struct buffer *buffer, ptrdiff_t start, ptrdiff_t end,
int preserve_chars_modiff)
{
struct buffer *old_buffer = current_buffer;
if (! preserve_chars_modiff)
CHARS_MODIFF = MODIFF;
- BVAR (buffer, point_before_scroll) = Qnil;
+ BSET (buffer, point_before_scroll, Qnil);
if (buffer != old_buffer)
set_buffer_internal (old_buffer);
by holding its value temporarily in a marker. */
void
-prepare_to_modify_buffer (EMACS_INT start, EMACS_INT end,
- EMACS_INT *preserve_ptr)
+prepare_to_modify_buffer (ptrdiff_t start, ptrdiff_t end,
+ ptrdiff_t *preserve_ptr)
{
struct buffer *base_buffer;
if (XBUFFER (XWINDOW (selected_window)->buffer) != current_buffer)
++windows_or_buffers_changed;
- if (BUF_INTERVALS (current_buffer) != 0)
+ if (buffer_get_intervals (current_buffer))
{
if (preserve_ptr)
{
: (!NILP (Vselect_active_regions)
&& !NILP (Vtransient_mark_mode))))
{
- EMACS_INT b = XMARKER (BVAR (current_buffer, mark))->charpos;
- EMACS_INT e = PT;
+ ptrdiff_t b = XMARKER (BVAR (current_buffer, mark))->charpos;
+ ptrdiff_t e = PT;
if (b < e)
Vsaved_region_selection = make_buffer_string (b, e, 0);
else if (b > e)
by holding its value temporarily in a marker. */
static void
-signal_before_change (EMACS_INT start_int, EMACS_INT end_int,
- EMACS_INT *preserve_ptr)
+signal_before_change (ptrdiff_t start_int, ptrdiff_t end_int,
+ ptrdiff_t *preserve_ptr)
{
Lisp_Object start, end;
Lisp_Object start_marker, end_marker;
Lisp_Object preserve_marker;
struct gcpro gcpro1, gcpro2, gcpro3;
- int count = SPECPDL_INDEX ();
+ ptrdiff_t count = SPECPDL_INDEX ();
if (inhibit_modification_hooks)
return;
XSETCDR (rvoe_arg, Qt);
}
- if (current_buffer->overlays_before || current_buffer->overlays_after)
+ if (buffer_has_overlays ())
{
PRESERVE_VALUE;
report_overlay_modification (FETCH_START, FETCH_END, 0,
after the change. */
void
-signal_after_change (EMACS_INT charpos, EMACS_INT lendel, EMACS_INT lenins)
+signal_after_change (ptrdiff_t charpos, ptrdiff_t lendel, ptrdiff_t lenins)
{
- int count = SPECPDL_INDEX ();
+ ptrdiff_t count = SPECPDL_INDEX ();
if (inhibit_modification_hooks)
return;
just record the args that we were going to use. */
if (! NILP (Vcombine_after_change_calls)
&& NILP (Vbefore_change_functions)
- && !current_buffer->overlays_before
- && !current_buffer->overlays_after)
+ && !buffer_has_overlays ())
{
Lisp_Object elt;
XSETCDR (rvoe_arg, Qt);
}
- if (current_buffer->overlays_before || current_buffer->overlays_after)
+ if (buffer_has_overlays ())
report_overlay_modification (make_number (charpos),
make_number (charpos + lenins),
1,
doc: /* This function is for use internally in `combine-after-change-calls'. */)
(void)
{
- int count = SPECPDL_INDEX ();
- EMACS_INT beg, end, change;
- EMACS_INT begpos, endpos;
+ ptrdiff_t count = SPECPDL_INDEX ();
+ ptrdiff_t beg, end, change;
+ ptrdiff_t begpos, endpos;
Lisp_Object tail;
if (NILP (combine_after_change_list))
tail = XCDR (tail))
{
Lisp_Object elt;
- EMACS_INT thisbeg, thisend, thischange;
+ ptrdiff_t thisbeg, thisend, thischange;
/* Extract the info from the next element. */
elt = XCAR (tail);
combine_after_change_list = Qnil;
combine_after_change_buffer = Qnil;
- DEFVAR_BOOL ("check-markers-debug-flag", check_markers_debug_flag,
- 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,
doc: /* Used internally by the `combine-after-change-calls' macro. */);
Vcombine_after_change_calls = Qnil;
HCoop / bpt / emacs.git / blobdiff