[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/insdel.c
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] Changes to emacs/src/insdel.c |
Date: |
Tue, 04 Feb 2003 09:03:27 -0500 |
Index: emacs/src/insdel.c
diff -c emacs/src/insdel.c:1.172 emacs/src/insdel.c:1.173
*** emacs/src/insdel.c:1.172 Wed Oct 30 14:03:54 2002
--- emacs/src/insdel.c Tue Feb 4 09:03:12 2003
***************
*** 373,379 ****
if (! m->insertion_type)
/* Normal markers will end up at the beginning of the
re-inserted text after undoing a deletion, and must be
! adjusted to move them to the correct place. */
record_marker_adjustment (marker, from - charpos);
else if (charpos < to)
/* Before-insertion markers will automatically move forward
--- 373,379 ----
if (! m->insertion_type)
/* Normal markers will end up at the beginning of the
re-inserted text after undoing a deletion, and must be
! adjusted to move them to the correct place. */
record_marker_adjustment (marker, from - charpos);
else if (charpos < to)
/* Before-insertion markers will automatically move forward
***************
*** 536,542 ****
That won't work because so many places use `int'.
Make sure we don't introduce overflows in the calculation. */
!
if (Z_BYTE - BEG_BYTE + GAP_SIZE
>= (((EMACS_INT) 1 << (min (VALBITS, BITS_PER_INT) - 1)) - 1
- nbytes_added))
--- 536,542 ----
That won't work because so many places use `int'.
Make sure we don't introduce overflows in the calculation. */
!
if (Z_BYTE - BEG_BYTE + GAP_SIZE
>= (((EMACS_INT) 1 << (min (VALBITS, BITS_PER_INT) - 1)) - 1
- nbytes_added))
***************
*** 990,996 ****
{
if (nchars == 0)
return;
!
if (NILP (current_buffer->enable_multibyte_characters))
nchars = nbytes;
--- 990,996 ----
{
if (nchars == 0)
return;
!
if (NILP (current_buffer->enable_multibyte_characters))
nchars = nbytes;
***************
*** 1173,1179 ****
/* 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);
--- 1173,1179 ----
/* 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);
***************
*** 1239,1251 ****
if (chunk < incoming_nbytes)
outgoing_after_gap
! = count_size_as_multibyte (BUF_BYTE_ADDRESS (buf,
from_byte + chunk),
incoming_nbytes - chunk);
outgoing_nbytes = outgoing_before_gap + outgoing_after_gap;
}
!
/* Make sure point-max won't overflow after this insertion. */
XSETINT (temp, outgoing_nbytes + Z);
if (outgoing_nbytes + Z != XINT (temp))
--- 1239,1251 ----
if (chunk < incoming_nbytes)
outgoing_after_gap
! = count_size_as_multibyte (BUF_BYTE_ADDRESS (buf,
from_byte + chunk),
incoming_nbytes - chunk);
outgoing_nbytes = outgoing_before_gap + outgoing_after_gap;
}
!
/* Make sure point-max won't overflow after this insertion. */
XSETINT (temp, outgoing_nbytes + Z);
if (outgoing_nbytes + Z != XINT (temp))
***************
*** 1329,1335 ****
from += nchars;
intervals = copy_intervals (intervals, from, nchars);
}
!
/* Insert those intervals. */
graft_intervals_into_buffer (intervals, PT, nchars, current_buffer,
inherit);
--- 1329,1335 ----
from += nchars;
intervals = copy_intervals (intervals, from, nchars);
}
!
/* Insert those intervals. */
graft_intervals_into_buffer (intervals, PT, nchars, current_buffer,
inherit);
***************
*** 2129,2135 ****
return;
}
! if (!NILP (combine_after_change_list))
Fcombine_after_change_execute ();
if (!NILP (Vafter_change_functions))
--- 2129,2135 ----
return;
}
! if (!NILP (combine_after_change_list))
Fcombine_after_change_execute ();
if (!NILP (Vafter_change_functions))
***************
*** 2260,2266 ****
that was changed. */
begpos = BEG + beg;
endpos = Z - end;
!
/* We are about to handle these, so discard them. */
combine_after_change_list = Qnil;
--- 2260,2266 ----
that was changed. */
begpos = BEG + beg;
endpos = Z - end;
!
/* We are about to handle these, so discard them. */
combine_after_change_list = Qnil;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/src/insdel.c,
Juanma Barranquero <=