Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 18:37:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Never move gap in make_buffer_string_both.

Browse source 
* editfns.c (make_buffer_string_both): If requested range intersects
the gap, don't move the latter but copy in two regions, thus avoiding
unnecessary relocation of buffer data.
This commit is contained in:
Dmitry Antipov 2015-01-14 15:56:46 +03:00
parent 99a1492b8a
commit 009836b97c
2 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -21,6 +21,10 @@
(Fencode_time): ... adjusted user.
(Fset_time_zone_rule): Use decode_time_zone.
* editfns.c (make_buffer_string_both): If requested range intersects
the gap, don't move the latter but copy in two regions, thus avoiding
unnecessary relocation of buffer data.
2015-01-14 Paul Eggert <eggert@cs.ucla.edu>
Use bool for boolean in xmenu.c, xml.c

25
src/editfns.c
View file

@ -2624,15 +2624,34 @@ make_buffer_string_both (ptrdiff_t start, ptrdiff_t start_byte,
ptrdiff_t end, ptrdiff_t end_byte, bool props)
{
Lisp_Object result, tem, tem1;
ptrdiff_t beg0, end0, beg1, end1, size;
if (start < GPT && GPT < end)
move_gap_both (start, start_byte);
if (start_byte < GPT_BYTE && GPT_BYTE < end_byte)
{
/* Two regions, before and after the gap. */
beg0 = start_byte;
end0 = GPT_BYTE;
beg1 = GPT_BYTE + GAP_SIZE - BEG_BYTE;
end1 = end_byte + GAP_SIZE - BEG_BYTE;
}
else
{
/* The only region. */
beg0 = start_byte;
end0 = end_byte;
beg1 = -1;
end1 = -1;
}
if (! NILP (BVAR (current_buffer, enable_multibyte_characters)))
result = make_uninit_multibyte_string (end - start, end_byte - start_byte);
else
result = make_uninit_string (end - start);
memcpy (SDATA (result), BYTE_POS_ADDR (start_byte), end_byte - start_byte);
size = end0 - beg0;
memcpy (SDATA (result), BYTE_POS_ADDR (beg0), size);
if (beg1 != -1)
memcpy (SDATA (result) + size, BEG_ADDR + beg1, end1 - beg1);
/* If desired, update and copy the text properties. */
if (props)