1991-01-05 15:12:15 +00:00
|
|
|
|
/* Buffer insertion/deletion and gap motion for GNU Emacs.
|
2005-08-07 12:33:19 +00:00
|
|
|
|
Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001,
|
2009-01-08 03:15:17 +00:00
|
|
|
|
2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
|
2008-01-08 04:37:27 +00:00
|
|
|
|
Free Software Foundation, Inc.
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
|
|
|
|
This file is part of GNU Emacs.
|
|
|
|
|
|
2008-05-14 07:50:26 +00:00
|
|
|
|
GNU Emacs is free software: you can redistribute it and/or modify
|
1991-01-05 15:12:15 +00:00
|
|
|
|
it under the terms of the GNU General Public License as published by
|
2008-05-14 07:50:26 +00:00
|
|
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
(at your option) any later version.
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
|
|
|
|
GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
2008-05-14 07:50:26 +00:00
|
|
|
|
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
|
|
|
|
|
1993-09-10 06:15:46 +00:00
|
|
|
|
#include <config.h>
|
2009-10-19 04:27:09 +00:00
|
|
|
|
#include <setjmp.h>
|
1991-01-05 15:12:15 +00:00
|
|
|
|
#include "lisp.h"
|
1992-10-01 00:56:11 +00:00
|
|
|
|
#include "intervals.h"
|
1991-01-05 15:12:15 +00:00
|
|
|
|
#include "buffer.h"
|
2002-03-01 01:42:42 +00:00
|
|
|
|
#include "character.h"
|
1991-01-05 15:12:15 +00:00
|
|
|
|
#include "window.h"
|
1993-04-07 22:11:21 +00:00
|
|
|
|
#include "blockinput.h"
|
1998-04-14 12:25:56 +00:00
|
|
|
|
#include "region-cache.h"
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1997-06-25 06:50:16 +00:00
|
|
|
|
#ifndef NULL
|
|
|
|
|
#define NULL 0
|
|
|
|
|
#endif
|
|
|
|
|
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
static void insert_from_string_1 (Lisp_Object string,
|
|
|
|
|
EMACS_INT pos, EMACS_INT pos_byte,
|
|
|
|
|
EMACS_INT nchars, EMACS_INT nbytes,
|
|
|
|
|
int inherit, int before_markers);
|
|
|
|
|
static void insert_from_buffer_1 (struct buffer *buf,
|
|
|
|
|
EMACS_INT from, EMACS_INT 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 void adjust_markers_gap_motion (EMACS_INT from, EMACS_INT to,
|
|
|
|
|
EMACS_INT amount);
|
|
|
|
|
static void adjust_markers_for_insert (EMACS_INT from, EMACS_INT from_byte,
|
|
|
|
|
EMACS_INT to, EMACS_INT to_byte,
|
|
|
|
|
int before_markers);
|
|
|
|
|
static void adjust_markers_for_replace (EMACS_INT, EMACS_INT, EMACS_INT,
|
|
|
|
|
EMACS_INT, EMACS_INT, EMACS_INT);
|
|
|
|
|
static void adjust_point (EMACS_INT nchars, EMACS_INT nbytes);
|
1994-04-08 00:44:35 +00:00
|
|
|
|
|
1996-11-09 21:36:00 +00:00
|
|
|
|
Lisp_Object Fcombine_after_change_execute ();
|
|
|
|
|
|
|
|
|
|
/* Non-nil means don't call the after-change-functions right away,
|
|
|
|
|
just record an element in Vcombine_after_change_calls_list. */
|
|
|
|
|
Lisp_Object Vcombine_after_change_calls;
|
|
|
|
|
|
|
|
|
|
/* List of elements of the form (BEG-UNCHANGED END-UNCHANGED CHANGE-AMOUNT)
|
|
|
|
|
describing changes which happened while combine_after_change_calls
|
|
|
|
|
was nonzero. We use this to decide how to call them
|
|
|
|
|
once the deferral ends.
|
|
|
|
|
|
|
|
|
|
In each element.
|
|
|
|
|
BEG-UNCHANGED is the number of chars before the changed range.
|
|
|
|
|
END-UNCHANGED is the number of chars after the changed range,
|
|
|
|
|
and CHANGE-AMOUNT is the number of characters inserted by the change
|
|
|
|
|
(negative for a deletion). */
|
|
|
|
|
Lisp_Object combine_after_change_list;
|
|
|
|
|
|
|
|
|
|
/* Buffer which combine_after_change_list is about. */
|
|
|
|
|
Lisp_Object combine_after_change_buffer;
|
2001-09-11 12:31:56 +00:00
|
|
|
|
|
|
|
|
|
Lisp_Object Qinhibit_modification_hooks;
|
|
|
|
|
|
1998-01-09 22:46:07 +00:00
|
|
|
|
|
1998-03-28 21:52:10 +00:00
|
|
|
|
/* Check all markers in the current buffer, looking for something invalid. */
|
|
|
|
|
|
|
|
|
|
static int check_markers_debug_flag;
|
|
|
|
|
|
|
|
|
|
#define CHECK_MARKERS() \
|
|
|
|
|
if (check_markers_debug_flag) \
|
|
|
|
|
check_markers (); \
|
|
|
|
|
else
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
check_markers ()
|
|
|
|
|
{
|
2003-06-26 23:17:29 +00:00
|
|
|
|
register struct Lisp_Marker *tail;
|
1998-10-28 07:52:13 +00:00
|
|
|
|
int multibyte = ! NILP (current_buffer->enable_multibyte_characters);
|
1998-03-28 21:52:10 +00:00
|
|
|
|
|
2003-06-26 23:17:29 +00:00
|
|
|
|
for (tail = BUF_MARKERS (current_buffer); tail; tail = tail->next)
|
1998-03-28 21:52:10 +00:00
|
|
|
|
{
|
2003-06-26 23:17:29 +00:00
|
|
|
|
if (tail->buffer->text != current_buffer->text)
|
1998-03-28 21:52:10 +00:00
|
|
|
|
abort ();
|
2003-06-26 23:17:29 +00:00
|
|
|
|
if (tail->charpos > Z)
|
1998-03-28 21:52:10 +00:00
|
|
|
|
abort ();
|
2003-06-26 23:17:29 +00:00
|
|
|
|
if (tail->bytepos > Z_BYTE)
|
1998-03-28 21:52:10 +00:00
|
|
|
|
abort ();
|
2003-06-26 23:17:29 +00:00
|
|
|
|
if (multibyte && ! CHAR_HEAD_P (FETCH_BYTE (tail->bytepos)))
|
1998-10-28 07:52:13 +00:00
|
|
|
|
abort ();
|
1998-03-28 21:52:10 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
/* Move gap to position CHARPOS.
|
1991-01-05 15:12:15 +00:00
|
|
|
|
Note that this can quit! */
|
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
move_gap (EMACS_INT charpos)
|
1991-01-05 15:12:15 +00:00
|
|
|
|
{
|
1998-01-01 07:03:19 +00:00
|
|
|
|
move_gap_both (charpos, charpos_to_bytepos (charpos));
|
1991-01-05 15:12:15 +00:00
|
|
|
|
}
|
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
/* Move gap to byte position BYTEPOS, which is also char position CHARPOS.
|
|
|
|
|
Note that this can quit! */
|
|
|
|
|
|
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
move_gap_both (EMACS_INT charpos, EMACS_INT bytepos)
|
1998-01-01 07:03:19 +00:00
|
|
|
|
{
|
|
|
|
|
if (bytepos < GPT_BYTE)
|
|
|
|
|
gap_left (charpos, bytepos, 0);
|
|
|
|
|
else if (bytepos > GPT_BYTE)
|
|
|
|
|
gap_right (charpos, bytepos);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Move the gap to a position less than the current GPT.
|
|
|
|
|
BYTEPOS describes the new position as a byte position,
|
|
|
|
|
and CHARPOS is the corresponding char position.
|
1991-01-05 15:12:15 +00:00
|
|
|
|
If NEWGAP is nonzero, then don't update beg_unchanged and end_unchanged. */
|
|
|
|
|
|
1994-04-26 02:11:35 +00:00
|
|
|
|
static void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
gap_left (EMACS_INT charpos, EMACS_INT bytepos, int newgap)
|
1991-01-05 15:12:15 +00:00
|
|
|
|
{
|
|
|
|
|
register unsigned char *to, *from;
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
register EMACS_INT i;
|
|
|
|
|
EMACS_INT new_s1;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
|
|
|
|
if (!newgap)
|
1999-08-23 00:11:45 +00:00
|
|
|
|
BUF_COMPUTE_UNCHANGED (current_buffer, charpos, GPT);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
i = GPT_BYTE;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
to = GAP_END_ADDR;
|
|
|
|
|
from = GPT_ADDR;
|
1998-01-01 07:03:19 +00:00
|
|
|
|
new_s1 = GPT_BYTE;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
|
|
|
|
/* Now copy the characters. To move the gap down,
|
|
|
|
|
copy characters up. */
|
|
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
/* I gets number of characters left to copy. */
|
1998-01-01 07:03:19 +00:00
|
|
|
|
i = new_s1 - bytepos;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
if (i == 0)
|
|
|
|
|
break;
|
|
|
|
|
/* If a quit is requested, stop copying now.
|
1998-01-01 07:03:19 +00:00
|
|
|
|
Change BYTEPOS to be where we have actually moved the gap to. */
|
1991-01-05 15:12:15 +00:00
|
|
|
|
if (QUITP)
|
|
|
|
|
{
|
1998-01-01 07:03:19 +00:00
|
|
|
|
bytepos = new_s1;
|
|
|
|
|
charpos = BYTE_TO_CHAR (bytepos);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
/* Move at most 32000 chars before checking again for a quit. */
|
|
|
|
|
if (i > 32000)
|
|
|
|
|
i = 32000;
|
|
|
|
|
#ifdef GAP_USE_BCOPY
|
|
|
|
|
if (i >= 128
|
|
|
|
|
/* bcopy is safe if the two areas of memory do not overlap
|
|
|
|
|
or on systems where bcopy is always safe for moving upward. */
|
|
|
|
|
&& (BCOPY_UPWARD_SAFE
|
|
|
|
|
|| to - from >= 128))
|
|
|
|
|
{
|
|
|
|
|
/* If overlap is not safe, avoid it by not moving too many
|
|
|
|
|
characters at once. */
|
|
|
|
|
if (!BCOPY_UPWARD_SAFE && i > to - from)
|
|
|
|
|
i = to - from;
|
|
|
|
|
new_s1 -= i;
|
|
|
|
|
from -= i, to -= i;
|
|
|
|
|
bcopy (from, to, i);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
#endif
|
|
|
|
|
{
|
|
|
|
|
new_s1 -= i;
|
|
|
|
|
while (--i >= 0)
|
|
|
|
|
*--to = *--from;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
/* Adjust markers, and buffer data structure, to put the gap at BYTEPOS.
|
|
|
|
|
BYTEPOS is where the loop above stopped, which may be what was specified
|
1991-01-05 15:12:15 +00:00
|
|
|
|
or may be where a quit was detected. */
|
1998-01-01 07:03:19 +00:00
|
|
|
|
adjust_markers_gap_motion (bytepos, GPT_BYTE, GAP_SIZE);
|
|
|
|
|
GPT_BYTE = bytepos;
|
|
|
|
|
GPT = charpos;
|
|
|
|
|
if (bytepos < charpos)
|
|
|
|
|
abort ();
|
1997-02-20 06:50:03 +00:00
|
|
|
|
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
|
1991-01-05 15:12:15 +00:00
|
|
|
|
QUIT;
|
|
|
|
|
}
|
|
|
|
|
|
2009-10-04 02:58:53 +00:00
|
|
|
|
/* Move the gap to a position greater than the current GPT.
|
1998-01-01 07:03:19 +00:00
|
|
|
|
BYTEPOS describes the new position as a byte position,
|
|
|
|
|
and CHARPOS is the corresponding char position. */
|
|
|
|
|
|
1994-04-26 02:11:35 +00:00
|
|
|
|
static void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
gap_right (EMACS_INT charpos, EMACS_INT bytepos)
|
1991-01-05 15:12:15 +00:00
|
|
|
|
{
|
|
|
|
|
register unsigned char *to, *from;
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
register EMACS_INT i;
|
|
|
|
|
EMACS_INT new_s1;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1999-08-23 00:11:45 +00:00
|
|
|
|
BUF_COMPUTE_UNCHANGED (current_buffer, charpos, GPT);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
i = GPT_BYTE;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
from = GAP_END_ADDR;
|
|
|
|
|
to = GPT_ADDR;
|
1998-01-01 07:03:19 +00:00
|
|
|
|
new_s1 = GPT_BYTE;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
|
|
|
|
/* Now copy the characters. To move the gap up,
|
|
|
|
|
copy characters down. */
|
|
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
/* I gets number of characters left to copy. */
|
1998-01-01 07:03:19 +00:00
|
|
|
|
i = bytepos - new_s1;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
if (i == 0)
|
|
|
|
|
break;
|
|
|
|
|
/* If a quit is requested, stop copying now.
|
1998-01-01 07:03:19 +00:00
|
|
|
|
Change BYTEPOS to be where we have actually moved the gap to. */
|
1991-01-05 15:12:15 +00:00
|
|
|
|
if (QUITP)
|
|
|
|
|
{
|
1998-01-01 07:03:19 +00:00
|
|
|
|
bytepos = new_s1;
|
|
|
|
|
charpos = BYTE_TO_CHAR (bytepos);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
/* Move at most 32000 chars before checking again for a quit. */
|
|
|
|
|
if (i > 32000)
|
|
|
|
|
i = 32000;
|
|
|
|
|
#ifdef GAP_USE_BCOPY
|
|
|
|
|
if (i >= 128
|
|
|
|
|
/* bcopy is safe if the two areas of memory do not overlap
|
|
|
|
|
or on systems where bcopy is always safe for moving downward. */
|
|
|
|
|
&& (BCOPY_DOWNWARD_SAFE
|
|
|
|
|
|| from - to >= 128))
|
|
|
|
|
{
|
|
|
|
|
/* If overlap is not safe, avoid it by not moving too many
|
|
|
|
|
characters at once. */
|
|
|
|
|
if (!BCOPY_DOWNWARD_SAFE && i > from - to)
|
|
|
|
|
i = from - to;
|
|
|
|
|
new_s1 += i;
|
|
|
|
|
bcopy (from, to, i);
|
|
|
|
|
from += i, to += i;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
#endif
|
|
|
|
|
{
|
|
|
|
|
new_s1 += i;
|
|
|
|
|
while (--i >= 0)
|
|
|
|
|
*to++ = *from++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
adjust_markers_gap_motion (GPT_BYTE + GAP_SIZE, bytepos + GAP_SIZE,
|
|
|
|
|
- GAP_SIZE);
|
|
|
|
|
GPT = charpos;
|
|
|
|
|
GPT_BYTE = bytepos;
|
|
|
|
|
if (bytepos < charpos)
|
|
|
|
|
abort ();
|
1997-02-20 06:50:03 +00:00
|
|
|
|
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
|
1991-01-05 15:12:15 +00:00
|
|
|
|
QUIT;
|
|
|
|
|
}
|
1998-01-09 22:46:07 +00:00
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
/* Add AMOUNT to the byte position of every marker in the current buffer
|
|
|
|
|
whose current byte position is between FROM (exclusive) and TO (inclusive).
|
1996-02-03 18:06:29 +00:00
|
|
|
|
|
1991-01-05 15:12:15 +00:00
|
|
|
|
Also, any markers past the outside of that interval, in the direction
|
|
|
|
|
of adjustment, are first moved back to the near end of the interval
|
1996-02-03 18:06:29 +00:00
|
|
|
|
and then adjusted by AMOUNT.
|
|
|
|
|
|
|
|
|
|
When the latter adjustment is done, if AMOUNT is negative,
|
|
|
|
|
we record the adjustment for undo. (This case happens only for
|
1998-01-01 07:03:19 +00:00
|
|
|
|
deletion.)
|
|
|
|
|
|
|
|
|
|
The markers' character positions are not altered,
|
|
|
|
|
because gap motion does not affect character positions. */
|
|
|
|
|
|
|
|
|
|
int adjust_markers_test;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1994-04-26 02:11:35 +00:00
|
|
|
|
static void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
adjust_markers_gap_motion (EMACS_INT from, EMACS_INT to, EMACS_INT amount)
|
1991-01-05 15:12:15 +00:00
|
|
|
|
{
|
1998-01-02 21:29:48 +00:00
|
|
|
|
/* Now that a marker has a bytepos, not counting the gap,
|
|
|
|
|
nothing needs to be done here. */
|
|
|
|
|
#if 0
|
1991-01-05 15:12:15 +00:00
|
|
|
|
Lisp_Object marker;
|
|
|
|
|
register struct Lisp_Marker *m;
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
register EMACS_INT mpos;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1995-01-02 09:21:30 +00:00
|
|
|
|
marker = BUF_MARKERS (current_buffer);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1992-01-13 21:48:03 +00:00
|
|
|
|
while (!NILP (marker))
|
1991-01-05 15:12:15 +00:00
|
|
|
|
{
|
|
|
|
|
m = XMARKER (marker);
|
1998-01-02 21:29:48 +00:00
|
|
|
|
mpos = m->bytepos;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
if (amount > 0)
|
|
|
|
|
{
|
|
|
|
|
if (mpos > to && mpos < to + amount)
|
1998-01-01 07:03:19 +00:00
|
|
|
|
{
|
|
|
|
|
if (adjust_markers_test)
|
|
|
|
|
abort ();
|
|
|
|
|
mpos = to + amount;
|
|
|
|
|
}
|
1991-01-05 15:12:15 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
1996-02-03 18:06:29 +00:00
|
|
|
|
/* Here's the case where a marker is inside text being deleted.
|
|
|
|
|
AMOUNT can be negative for gap motion, too,
|
|
|
|
|
but then this range contains no markers. */
|
1991-01-05 15:12:15 +00:00
|
|
|
|
if (mpos > from + amount && mpos <= from)
|
1996-02-03 18:06:29 +00:00
|
|
|
|
{
|
1998-01-01 07:03:19 +00:00
|
|
|
|
if (adjust_markers_test)
|
|
|
|
|
abort ();
|
|
|
|
|
mpos = from + amount;
|
1996-02-03 18:06:29 +00:00
|
|
|
|
}
|
1991-01-05 15:12:15 +00:00
|
|
|
|
}
|
|
|
|
|
if (mpos > from && mpos <= to)
|
|
|
|
|
mpos += amount;
|
|
|
|
|
m->bufpos = mpos;
|
|
|
|
|
marker = m->chain;
|
|
|
|
|
}
|
1998-01-02 21:29:48 +00:00
|
|
|
|
#endif
|
1991-01-05 15:12:15 +00:00
|
|
|
|
}
|
1998-01-09 22:46:07 +00:00
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
/* Adjust all markers for a deletion
|
|
|
|
|
whose range in bytes is FROM_BYTE to TO_BYTE.
|
|
|
|
|
The range in charpos is FROM to TO.
|
|
|
|
|
|
|
|
|
|
This function assumes that the gap is adjacent to
|
|
|
|
|
or inside of the range being deleted. */
|
1995-09-03 18:51:47 +00:00
|
|
|
|
|
1999-12-06 17:04:33 +00:00
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
adjust_markers_for_delete (EMACS_INT from, EMACS_INT from_byte,
|
|
|
|
|
EMACS_INT to, EMACS_INT to_byte)
|
1998-01-01 07:03:19 +00:00
|
|
|
|
{
|
|
|
|
|
Lisp_Object marker;
|
|
|
|
|
register struct Lisp_Marker *m;
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
register EMACS_INT charpos;
|
1998-01-01 07:03:19 +00:00
|
|
|
|
|
2003-06-26 23:17:29 +00:00
|
|
|
|
for (m = BUF_MARKERS (current_buffer); m; m = m->next)
|
1998-01-01 07:03:19 +00:00
|
|
|
|
{
|
|
|
|
|
charpos = m->charpos;
|
|
|
|
|
|
|
|
|
|
if (charpos > Z)
|
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
|
|
/* If the marker is after the deletion,
|
1998-01-02 21:29:48 +00:00
|
|
|
|
relocate by number of chars / bytes deleted. */
|
1998-01-01 07:03:19 +00:00
|
|
|
|
if (charpos > to)
|
1998-01-02 21:29:48 +00:00
|
|
|
|
{
|
|
|
|
|
m->charpos -= to - from;
|
|
|
|
|
m->bytepos -= to_byte - from_byte;
|
|
|
|
|
}
|
|
|
|
|
/* Here's the case where a marker is inside text being deleted. */
|
1998-01-01 07:03:19 +00:00
|
|
|
|
else if (charpos > from)
|
|
|
|
|
{
|
2000-10-18 06:20:27 +00:00
|
|
|
|
if (! m->insertion_type)
|
2003-06-26 23:17:29 +00:00
|
|
|
|
{ /* Normal markers will end up at the beginning of the
|
2000-10-18 06:20:27 +00:00
|
|
|
|
re-inserted text after undoing a deletion, and must be
|
2003-02-04 14:56:31 +00:00
|
|
|
|
adjusted to move them to the correct place. */
|
2003-06-26 23:17:29 +00:00
|
|
|
|
XSETMISC (marker, m);
|
2009-11-24 21:33:23 +00:00
|
|
|
|
record_marker_adjustment (marker, from - charpos);
|
2003-06-26 23:17:29 +00:00
|
|
|
|
}
|
2000-10-18 06:20:27 +00:00
|
|
|
|
else if (charpos < to)
|
2003-06-26 23:17:29 +00:00
|
|
|
|
{ /* Before-insertion markers will automatically move forward
|
2000-10-18 06:20:27 +00:00
|
|
|
|
upon re-inserting the deleted text, so we have to arrange
|
|
|
|
|
for them to move backward to the correct position. */
|
2003-06-26 23:17:29 +00:00
|
|
|
|
XSETMISC (marker, m);
|
2009-11-24 21:33:23 +00:00
|
|
|
|
record_marker_adjustment (marker, to - charpos);
|
2003-06-26 23:17:29 +00:00
|
|
|
|
}
|
1998-01-01 07:03:19 +00:00
|
|
|
|
m->charpos = from;
|
1998-01-02 21:29:48 +00:00
|
|
|
|
m->bytepos = from_byte;
|
1998-01-01 07:03:19 +00:00
|
|
|
|
}
|
2000-10-18 06:20:27 +00:00
|
|
|
|
/* 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. */
|
2003-06-26 23:17:29 +00:00
|
|
|
|
XSETMISC (marker, m);
|
2000-10-18 06:20:27 +00:00
|
|
|
|
record_marker_adjustment (marker, to - from);
|
|
|
|
|
}
|
1998-01-01 07:03:19 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
1998-09-16 07:21:31 +00:00
|
|
|
|
|
1998-03-20 06:10:36 +00:00
|
|
|
|
|
1998-03-09 23:22:44 +00:00
|
|
|
|
/* 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).
|
1998-01-01 07:03:19 +00:00
|
|
|
|
|
|
|
|
|
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
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
adjust_markers_for_insert (EMACS_INT from, EMACS_INT from_byte,
|
|
|
|
|
EMACS_INT to, EMACS_INT to_byte, int before_markers)
|
1995-09-03 18:51:47 +00:00
|
|
|
|
{
|
2003-06-26 23:17:29 +00:00
|
|
|
|
struct Lisp_Marker *m;
|
1997-02-20 06:50:03 +00:00
|
|
|
|
int adjusted = 0;
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT nchars = to - from;
|
|
|
|
|
EMACS_INT nbytes = to_byte - from_byte;
|
1995-09-03 18:51:47 +00:00
|
|
|
|
|
2003-06-26 23:17:29 +00:00
|
|
|
|
for (m = BUF_MARKERS (current_buffer); m; m = m->next)
|
1995-09-03 18:51:47 +00:00
|
|
|
|
{
|
2007-10-02 21:07:15 +00:00
|
|
|
|
eassert (m->bytepos >= m->charpos
|
|
|
|
|
&& m->bytepos - m->charpos <= Z_BYTE - Z);
|
1998-03-11 22:08:24 +00:00
|
|
|
|
|
1998-03-09 23:22:44 +00:00
|
|
|
|
if (m->bytepos == from_byte)
|
1997-02-20 06:50:03 +00:00
|
|
|
|
{
|
1998-03-09 23:22:44 +00:00
|
|
|
|
if (m->insertion_type || before_markers)
|
|
|
|
|
{
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
m->bytepos = to_byte;
|
|
|
|
|
m->charpos = to;
|
1998-03-09 23:22:44 +00:00
|
|
|
|
if (m->insertion_type)
|
|
|
|
|
adjusted = 1;
|
|
|
|
|
}
|
1998-03-11 00:47:48 +00:00
|
|
|
|
}
|
1998-01-02 21:29:48 +00:00
|
|
|
|
else if (m->bytepos > from_byte)
|
|
|
|
|
{
|
|
|
|
|
m->bytepos += nbytes;
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
m->charpos += nchars;
|
1998-01-02 21:29:48 +00:00
|
|
|
|
}
|
1995-09-03 18:51:47 +00:00
|
|
|
|
}
|
1998-01-01 07:03:19 +00:00
|
|
|
|
|
|
|
|
|
/* Adjusting only markers whose insertion-type is t may result in
|
2004-04-16 12:51:06 +00:00
|
|
|
|
- disordered start and end in overlays, and
|
|
|
|
|
- disordered overlays in the slot `overlays_before' of current_buffer. */
|
1997-02-20 06:50:03 +00:00
|
|
|
|
if (adjusted)
|
2004-04-16 12:51:06 +00:00
|
|
|
|
{
|
|
|
|
|
fix_start_end_in_overlays(from, to);
|
|
|
|
|
fix_overlays_before (current_buffer, from, to);
|
|
|
|
|
}
|
1995-09-03 18:51:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
/* Adjust point for an insertion of NBYTES bytes, which are NCHARS characters.
|
|
|
|
|
|
|
|
|
|
This is used only when the value of point changes due to an insert
|
|
|
|
|
or delete; it does not represent a conceptual change in point as a
|
|
|
|
|
marker. In particular, point is not crossing any interval
|
|
|
|
|
boundaries, so there's no need to use the usual SET_PT macro. In
|
|
|
|
|
fact it would be incorrect to do so, because either the old or the
|
|
|
|
|
new value of point is out of sync with the current set of
|
|
|
|
|
intervals. */
|
|
|
|
|
|
1994-04-26 02:22:52 +00:00
|
|
|
|
static void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
adjust_point (EMACS_INT nchars, EMACS_INT nbytes)
|
1994-04-26 02:22:52 +00:00
|
|
|
|
{
|
1998-01-01 07:03:19 +00:00
|
|
|
|
BUF_PT (current_buffer) += nchars;
|
|
|
|
|
BUF_PT_BYTE (current_buffer) += nbytes;
|
|
|
|
|
|
|
|
|
|
/* In a single-byte buffer, the two positions must be equal. */
|
2007-10-02 21:07:15 +00:00
|
|
|
|
eassert (PT_BYTE >= PT && PT_BYTE - PT <= ZV_BYTE - ZV);
|
1994-04-26 02:22:52 +00:00
|
|
|
|
}
|
1998-03-30 06:00:54 +00:00
|
|
|
|
|
|
|
|
|
/* 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
|
2000-05-22 00:19:43 +00:00
|
|
|
|
(NEW_BYTES). It is assumed that OLD_CHARS > 0, i.e., this is not
|
|
|
|
|
an insertion. */
|
1998-03-30 06:00:54 +00:00
|
|
|
|
|
|
|
|
|
static void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
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)
|
1998-03-30 06:00:54 +00:00
|
|
|
|
{
|
2003-06-26 23:17:29 +00:00
|
|
|
|
register struct Lisp_Marker *m;
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
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;
|
1998-03-30 06:00:54 +00:00
|
|
|
|
|
2003-06-26 23:17:29 +00:00
|
|
|
|
for (m = BUF_MARKERS (current_buffer); m; m = m->next)
|
1998-03-30 06:00:54 +00:00
|
|
|
|
{
|
2000-05-22 00:19:43 +00:00
|
|
|
|
if (m->bytepos >= prev_to_byte)
|
1998-03-30 06:00:54 +00:00
|
|
|
|
{
|
2000-05-22 00:19:43 +00:00
|
|
|
|
m->charpos += diff_chars;
|
|
|
|
|
m->bytepos += diff_bytes;
|
1998-03-30 06:00:54 +00:00
|
|
|
|
}
|
2000-05-22 00:19:43 +00:00
|
|
|
|
else if (m->bytepos > from_byte)
|
1998-03-30 06:00:54 +00:00
|
|
|
|
{
|
|
|
|
|
m->charpos = from;
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
m->bytepos = from_byte;
|
1998-03-30 06:00:54 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
1998-10-14 07:17:22 +00:00
|
|
|
|
|
|
|
|
|
CHECK_MARKERS ();
|
1998-03-30 06:00:54 +00:00
|
|
|
|
}
|
|
|
|
|
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
/* Make the gap NBYTES_ADDED bytes longer. */
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
make_gap_larger (EMACS_INT nbytes_added)
|
1991-01-05 15:12:15 +00:00
|
|
|
|
{
|
|
|
|
|
Lisp_Object tem;
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT real_gap_loc;
|
|
|
|
|
EMACS_INT real_gap_loc_byte;
|
|
|
|
|
EMACS_INT old_gap_size;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
|
|
|
|
/* If we have to get more space, get enough to last a while. */
|
1998-01-01 07:03:19 +00:00
|
|
|
|
nbytes_added += 2000;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
2009-11-19 01:40:22 +00:00
|
|
|
|
{ EMACS_INT total_size = Z_BYTE - BEG_BYTE + GAP_SIZE + nbytes_added;
|
|
|
|
|
if (total_size < 0
|
|
|
|
|
/* Don't allow a buffer size that won't fit in a Lisp integer. */
|
|
|
|
|
|| total_size != XINT (make_number (total_size))
|
|
|
|
|
/* 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 still use `int'. */
|
|
|
|
|
|| total_size != (EMACS_INT) (int) total_size)
|
|
|
|
|
error ("Buffer exceeds maximum size");
|
|
|
|
|
}
|
1995-05-04 22:16:18 +00:00
|
|
|
|
|
2000-09-14 15:13:29 +00:00
|
|
|
|
enlarge_buffer_text (current_buffer, nbytes_added);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
|
|
|
|
/* Prevent quitting in move_gap. */
|
|
|
|
|
tem = Vinhibit_quit;
|
|
|
|
|
Vinhibit_quit = Qt;
|
|
|
|
|
|
|
|
|
|
real_gap_loc = GPT;
|
1998-01-01 07:03:19 +00:00
|
|
|
|
real_gap_loc_byte = GPT_BYTE;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
old_gap_size = GAP_SIZE;
|
|
|
|
|
|
|
|
|
|
/* Call the newly allocated space a gap at the end of the whole space. */
|
|
|
|
|
GPT = Z + GAP_SIZE;
|
1998-01-02 23:12:03 +00:00
|
|
|
|
GPT_BYTE = Z_BYTE + GAP_SIZE;
|
1998-01-01 07:03:19 +00:00
|
|
|
|
GAP_SIZE = nbytes_added;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
|
|
|
|
/* Move the new gap down to be consecutive with the end of the old one.
|
|
|
|
|
This adjusts the markers properly too. */
|
1998-01-01 07:03:19 +00:00
|
|
|
|
gap_left (real_gap_loc + old_gap_size, real_gap_loc_byte + old_gap_size, 1);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
|
|
|
|
/* Now combine the two into one large gap. */
|
|
|
|
|
GAP_SIZE += old_gap_size;
|
|
|
|
|
GPT = real_gap_loc;
|
1998-01-01 07:03:19 +00:00
|
|
|
|
GPT_BYTE = real_gap_loc_byte;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1997-02-20 06:50:03 +00:00
|
|
|
|
/* Put an anchor. */
|
|
|
|
|
*(Z_ADDR) = 0;
|
|
|
|
|
|
1991-01-05 15:12:15 +00:00
|
|
|
|
Vinhibit_quit = tem;
|
|
|
|
|
}
|
2001-12-05 21:37:11 +00:00
|
|
|
|
|
|
|
|
|
|
2002-10-30 19:17:50 +00:00
|
|
|
|
/* Make the gap NBYTES_REMOVED bytes shorter. */
|
2001-12-05 21:37:11 +00:00
|
|
|
|
|
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
make_gap_smaller (EMACS_INT nbytes_removed)
|
2001-12-05 21:37:11 +00:00
|
|
|
|
{
|
|
|
|
|
Lisp_Object tem;
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
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;
|
2001-12-05 21:37:11 +00:00
|
|
|
|
|
|
|
|
|
/* 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;
|
2002-02-09 22:58:25 +00:00
|
|
|
|
new_gap_size = GAP_SIZE - nbytes_removed;
|
2001-12-05 21:37:11 +00:00
|
|
|
|
real_Z = Z;
|
|
|
|
|
real_Z_byte = Z_BYTE;
|
2002-02-09 22:58:25 +00:00
|
|
|
|
real_beg_unchanged = BEG_UNCHANGED;
|
2001-12-05 21:37:11 +00:00
|
|
|
|
|
|
|
|
|
/* 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. */
|
2002-02-09 22:58:25 +00:00
|
|
|
|
bzero (GPT_ADDR, new_gap_size);
|
|
|
|
|
GPT += new_gap_size;
|
|
|
|
|
GPT_BYTE += new_gap_size;
|
|
|
|
|
Z += new_gap_size;
|
|
|
|
|
Z_BYTE += new_gap_size;
|
2001-12-05 21:37:11 +00:00
|
|
|
|
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. */
|
2002-02-09 22:58:25 +00:00
|
|
|
|
GAP_SIZE = new_gap_size;
|
2001-12-05 21:37:11 +00:00
|
|
|
|
GPT = real_gap_loc;
|
|
|
|
|
GPT_BYTE = real_gap_loc_byte;
|
|
|
|
|
Z = real_Z;
|
|
|
|
|
Z_BYTE = real_Z_byte;
|
2002-02-09 22:58:25 +00:00
|
|
|
|
BEG_UNCHANGED = real_beg_unchanged;
|
2001-12-05 21:37:11 +00:00
|
|
|
|
|
|
|
|
|
/* Put an anchor. */
|
|
|
|
|
*(Z_ADDR) = 0;
|
|
|
|
|
|
|
|
|
|
Vinhibit_quit = tem;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
make_gap (EMACS_INT nbytes_added)
|
2001-12-05 21:37:11 +00:00
|
|
|
|
{
|
|
|
|
|
if (nbytes_added >= 0)
|
|
|
|
|
make_gap_larger (nbytes_added);
|
2001-12-11 21:13:53 +00:00
|
|
|
|
#if defined USE_MMAP_FOR_BUFFERS || defined REL_ALLOC || defined DOUG_LEA_MALLOC
|
2001-12-05 21:37:11 +00:00
|
|
|
|
else
|
|
|
|
|
make_gap_smaller (-nbytes_added);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1998-01-09 22:46:07 +00:00
|
|
|
|
/* Copy NBYTES bytes of text from FROM_ADDR to TO_ADDR.
|
|
|
|
|
FROM_MULTIBYTE says whether the incoming text is multibyte.
|
|
|
|
|
TO_MULTIBYTE says whether to store the text as multibyte.
|
|
|
|
|
If FROM_MULTIBYTE != TO_MULTIBYTE, we convert.
|
|
|
|
|
|
|
|
|
|
Return the number of bytes stored at TO_ADDR. */
|
|
|
|
|
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT
|
|
|
|
|
copy_text (const unsigned char *from_addr, unsigned char *to_addr,
|
|
|
|
|
EMACS_INT nbytes, int from_multibyte, int to_multibyte)
|
1998-01-09 22:46:07 +00:00
|
|
|
|
{
|
|
|
|
|
if (from_multibyte == to_multibyte)
|
|
|
|
|
{
|
|
|
|
|
bcopy (from_addr, to_addr, nbytes);
|
|
|
|
|
return nbytes;
|
|
|
|
|
}
|
|
|
|
|
else if (from_multibyte)
|
|
|
|
|
{
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT nchars = 0;
|
|
|
|
|
EMACS_INT bytes_left = nbytes;
|
1999-09-19 21:46:46 +00:00
|
|
|
|
Lisp_Object tbl = Qnil;
|
1998-08-02 01:06:57 +00:00
|
|
|
|
|
1998-01-09 22:46:07 +00:00
|
|
|
|
while (bytes_left > 0)
|
|
|
|
|
{
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
int thislen, c;
|
2009-11-21 11:52:23 +00:00
|
|
|
|
c = STRING_CHAR_AND_LENGTH (from_addr, thislen);
|
2008-12-30 01:48:56 +00:00
|
|
|
|
if (! ASCII_CHAR_P (c))
|
|
|
|
|
c &= 0xFF;
|
1998-08-02 01:06:57 +00:00
|
|
|
|
*to_addr++ = c;
|
1998-01-09 22:46:07 +00:00
|
|
|
|
from_addr += thislen;
|
1998-04-20 07:08:40 +00:00
|
|
|
|
bytes_left -= thislen;
|
1998-01-09 22:46:07 +00:00
|
|
|
|
nchars++;
|
|
|
|
|
}
|
|
|
|
|
return nchars;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
unsigned char *initial_to_addr = to_addr;
|
|
|
|
|
|
|
|
|
|
/* Convert single-byte to multibyte. */
|
|
|
|
|
while (nbytes > 0)
|
|
|
|
|
{
|
|
|
|
|
int c = *from_addr++;
|
|
|
|
|
|
2009-10-18 03:08:32 +00:00
|
|
|
|
if (!ASCII_CHAR_P (c))
|
1998-01-09 22:46:07 +00:00
|
|
|
|
{
|
2009-10-18 03:08:32 +00:00
|
|
|
|
c = BYTE8_TO_CHAR (c);
|
1999-12-15 00:13:49 +00:00
|
|
|
|
to_addr += CHAR_STRING (c, to_addr);
|
1998-01-09 22:46:07 +00:00
|
|
|
|
nbytes--;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
/* Special case for speed. */
|
|
|
|
|
*to_addr++ = c, nbytes--;
|
|
|
|
|
}
|
|
|
|
|
return to_addr - initial_to_addr;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the number of bytes it would take
|
|
|
|
|
to convert some single-byte text to multibyte.
|
|
|
|
|
The single-byte text consists of NBYTES bytes at PTR. */
|
|
|
|
|
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT
|
|
|
|
|
count_size_as_multibyte (const unsigned char *ptr, EMACS_INT nbytes)
|
1998-01-09 22:46:07 +00:00
|
|
|
|
{
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT i;
|
|
|
|
|
EMACS_INT outgoing_nbytes = 0;
|
1998-01-09 22:46:07 +00:00
|
|
|
|
|
|
|
|
|
for (i = 0; i < nbytes; i++)
|
|
|
|
|
{
|
|
|
|
|
unsigned int c = *ptr++;
|
1998-03-03 01:29:16 +00:00
|
|
|
|
|
2009-10-18 03:08:32 +00:00
|
|
|
|
if (ASCII_CHAR_P (c))
|
1998-03-03 01:29:16 +00:00
|
|
|
|
outgoing_nbytes++;
|
|
|
|
|
else
|
1998-01-09 22:46:07 +00:00
|
|
|
|
{
|
2009-10-18 03:08:32 +00:00
|
|
|
|
c = BYTE8_TO_CHAR (c);
|
1998-08-28 12:22:39 +00:00
|
|
|
|
outgoing_nbytes += CHAR_BYTES (c);
|
1998-01-09 22:46:07 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return outgoing_nbytes;
|
|
|
|
|
}
|
|
|
|
|
|
1991-01-05 15:12:15 +00:00
|
|
|
|
/* Insert a string of specified length before point.
|
1998-01-09 22:46:07 +00:00
|
|
|
|
This function judges multibyteness based on
|
|
|
|
|
enable_multibyte_characters in the current buffer;
|
|
|
|
|
it never converts between single-byte and multibyte.
|
|
|
|
|
|
1994-10-22 04:45:57 +00:00
|
|
|
|
DO NOT use this for the contents of a Lisp string or a Lisp buffer!
|
|
|
|
|
prepare_to_modify_buffer could relocate the text. */
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
insert (const unsigned char *string, EMACS_INT nbytes)
|
1991-01-05 15:12:15 +00:00
|
|
|
|
{
|
1998-01-01 07:03:19 +00:00
|
|
|
|
if (nbytes > 0)
|
1994-04-08 00:44:35 +00:00
|
|
|
|
{
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT len = chars_in_text (string, nbytes), opoint;
|
2005-12-23 17:37:50 +00:00
|
|
|
|
insert_1_both (string, len, nbytes, 0, 1, 0);
|
|
|
|
|
opoint = PT - len;
|
|
|
|
|
signal_after_change (opoint, 0, len);
|
1999-12-15 00:13:49 +00:00
|
|
|
|
update_compositions (opoint, PT, CHECK_BORDER);
|
1994-08-28 06:07:37 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1998-01-09 22:46:07 +00:00
|
|
|
|
/* Likewise, but inherit text properties from neighboring characters. */
|
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
insert_and_inherit (const unsigned char *string, EMACS_INT nbytes)
|
1994-08-28 06:07:37 +00:00
|
|
|
|
{
|
1998-01-01 07:03:19 +00:00
|
|
|
|
if (nbytes > 0)
|
1994-08-28 06:07:37 +00:00
|
|
|
|
{
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT len = chars_in_text (string, nbytes), opoint;
|
2005-12-23 17:37:50 +00:00
|
|
|
|
insert_1_both (string, len, nbytes, 1, 1, 0);
|
|
|
|
|
opoint = PT - len;
|
|
|
|
|
signal_after_change (opoint, 0, len);
|
1999-12-15 00:13:49 +00:00
|
|
|
|
update_compositions (opoint, PT, CHECK_BORDER);
|
1994-04-08 00:44:35 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1998-01-09 22:46:07 +00:00
|
|
|
|
/* Insert the character C before point. Do not inherit text properties. */
|
1998-01-01 07:03:19 +00:00
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
insert_char (int c)
|
1998-01-01 07:03:19 +00:00
|
|
|
|
{
|
1999-12-15 00:13:49 +00:00
|
|
|
|
unsigned char str[MAX_MULTIBYTE_LENGTH];
|
1998-01-09 22:46:07 +00:00
|
|
|
|
int len;
|
|
|
|
|
|
|
|
|
|
if (! NILP (current_buffer->enable_multibyte_characters))
|
1999-12-15 00:13:49 +00:00
|
|
|
|
len = CHAR_STRING (c, str);
|
1998-01-09 22:46:07 +00:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
len = 1;
|
1999-12-15 00:13:49 +00:00
|
|
|
|
str[0] = c;
|
1998-01-09 22:46:07 +00:00
|
|
|
|
}
|
1998-01-01 07:03:19 +00:00
|
|
|
|
|
|
|
|
|
insert (str, len);
|
|
|
|
|
}
|
|
|
|
|
|
1998-01-09 22:46:07 +00:00
|
|
|
|
/* Insert the null-terminated string S before point. */
|
1998-01-01 07:03:19 +00:00
|
|
|
|
|
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
insert_string (const char *s)
|
1998-01-01 07:03:19 +00:00
|
|
|
|
{
|
|
|
|
|
insert (s, strlen (s));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Like `insert' except that all markers pointing at the place where
|
|
|
|
|
the insertion happens are adjusted to point after it.
|
|
|
|
|
Don't use this function to insert part of a Lisp string,
|
|
|
|
|
since gc could happen and relocate it. */
|
|
|
|
|
|
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
insert_before_markers (const unsigned char *string, EMACS_INT nbytes)
|
1998-01-01 07:03:19 +00:00
|
|
|
|
{
|
|
|
|
|
if (nbytes > 0)
|
|
|
|
|
{
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT len = chars_in_text (string, nbytes), opoint;
|
2005-12-23 17:37:50 +00:00
|
|
|
|
insert_1_both (string, len, nbytes, 0, 1, 1);
|
|
|
|
|
opoint = PT - len;
|
|
|
|
|
signal_after_change (opoint, 0, len);
|
1999-12-15 00:13:49 +00:00
|
|
|
|
update_compositions (opoint, PT, CHECK_BORDER);
|
1998-01-01 07:03:19 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1998-01-09 22:46:07 +00:00
|
|
|
|
/* Likewise, but inherit text properties from neighboring characters. */
|
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
insert_before_markers_and_inherit (const unsigned char *string,
|
|
|
|
|
EMACS_INT nbytes)
|
1998-01-01 07:03:19 +00:00
|
|
|
|
{
|
|
|
|
|
if (nbytes > 0)
|
|
|
|
|
{
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT len = chars_in_text (string, nbytes), opoint;
|
2005-12-23 17:37:50 +00:00
|
|
|
|
insert_1_both (string, len, nbytes, 1, 1, 1);
|
|
|
|
|
opoint = PT - len;
|
|
|
|
|
signal_after_change (opoint, 0, len);
|
1999-12-15 00:13:49 +00:00
|
|
|
|
update_compositions (opoint, PT, CHECK_BORDER);
|
1998-01-01 07:03:19 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
1998-03-11 22:08:24 +00:00
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
/* Subroutine used by the insert functions above. */
|
|
|
|
|
|
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
insert_1 (const unsigned char *string, EMACS_INT nbytes,
|
|
|
|
|
int inherit, int prepare, int before_markers)
|
1994-04-08 00:44:35 +00:00
|
|
|
|
{
|
1998-03-09 23:22:44 +00:00
|
|
|
|
insert_1_both (string, chars_in_text (string, nbytes), nbytes,
|
|
|
|
|
inherit, prepare, before_markers);
|
|
|
|
|
}
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
|
1998-03-11 22:08:24 +00:00
|
|
|
|
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
#ifdef BYTE_COMBINING_DEBUG
|
|
|
|
|
|
1998-03-09 23:22:44 +00:00
|
|
|
|
/* See if the bytes before POS/POS_BYTE combine with bytes
|
|
|
|
|
at the start of STRING to form a single character.
|
1998-03-11 00:47:48 +00:00
|
|
|
|
If so, return the number of bytes at the start of STRING
|
1998-03-09 23:22:44 +00:00
|
|
|
|
which combine in this way. Otherwise, return 0. */
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1998-03-09 23:22:44 +00:00
|
|
|
|
int
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
count_combining_before (const unsigned char *string, EMACS_INT length,
|
|
|
|
|
EMACS_INT pos, EMACS_INT pos_byte)
|
1998-03-09 23:22:44 +00:00
|
|
|
|
{
|
1999-09-03 01:28:42 +00:00
|
|
|
|
int len, combining_bytes;
|
2002-07-16 19:48:28 +00:00
|
|
|
|
const unsigned char *p;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1998-03-09 23:22:44 +00:00
|
|
|
|
if (NILP (current_buffer->enable_multibyte_characters))
|
|
|
|
|
return 0;
|
1999-09-03 01:28:42 +00:00
|
|
|
|
|
|
|
|
|
/* At first, we can exclude the following cases:
|
|
|
|
|
(1) STRING[0] can't be a following byte of multibyte sequence.
|
|
|
|
|
(2) POS is the start of the current buffer.
|
|
|
|
|
(3) A character before POS is not a multibyte character. */
|
|
|
|
|
if (length == 0 || CHAR_HEAD_P (*string)) /* case (1) */
|
1998-03-09 23:22:44 +00:00
|
|
|
|
return 0;
|
1999-09-03 01:28:42 +00:00
|
|
|
|
if (pos_byte == BEG_BYTE) /* case (2) */
|
1998-03-09 23:22:44 +00:00
|
|
|
|
return 0;
|
1999-09-03 01:28:42 +00:00
|
|
|
|
len = 1;
|
|
|
|
|
p = BYTE_POS_ADDR (pos_byte - 1);
|
|
|
|
|
while (! CHAR_HEAD_P (*p)) p--, len++;
|
|
|
|
|
if (! BASE_LEADING_CODE_P (*p)) /* case (3) */
|
1998-03-09 23:22:44 +00:00
|
|
|
|
return 0;
|
1999-09-03 01:28:42 +00:00
|
|
|
|
|
|
|
|
|
combining_bytes = BYTES_BY_CHAR_HEAD (*p) - len;
|
|
|
|
|
if (combining_bytes <= 0)
|
|
|
|
|
/* The character preceding POS is, complete and no room for
|
|
|
|
|
combining bytes (combining_bytes == 0), or an independent 8-bit
|
|
|
|
|
character (combining_bytes < 0). */
|
1998-03-09 23:22:44 +00:00
|
|
|
|
return 0;
|
1998-03-11 00:47:48 +00:00
|
|
|
|
|
1999-09-03 01:28:42 +00:00
|
|
|
|
/* We have a combination situation. Count the bytes at STRING that
|
|
|
|
|
may combine. */
|
|
|
|
|
p = string + 1;
|
1998-03-11 00:47:48 +00:00
|
|
|
|
while (!CHAR_HEAD_P (*p) && p < string + length)
|
|
|
|
|
p++;
|
|
|
|
|
|
1999-09-03 01:28:42 +00:00
|
|
|
|
return (combining_bytes < p - string ? combining_bytes : p - string);
|
1998-03-09 23:22:44 +00:00
|
|
|
|
}
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1998-03-09 23:22:44 +00:00
|
|
|
|
/* See if the bytes after POS/POS_BYTE combine with bytes
|
|
|
|
|
at the end of STRING to form a single character.
|
|
|
|
|
If so, return the number of bytes after POS/POS_BYTE
|
|
|
|
|
which combine in this way. Otherwise, return 0. */
|
1992-10-01 00:56:11 +00:00
|
|
|
|
|
1998-03-09 23:22:44 +00:00
|
|
|
|
int
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
count_combining_after (const unsigned char *string,
|
|
|
|
|
EMACS_INT length, EMACS_INT pos, EMACS_INT pos_byte)
|
1998-03-09 23:22:44 +00:00
|
|
|
|
{
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT opos_byte = pos_byte;
|
|
|
|
|
EMACS_INT i;
|
|
|
|
|
EMACS_INT bytes;
|
1999-09-03 01:28:42 +00:00
|
|
|
|
unsigned char *bufp;
|
1998-01-01 07:03:19 +00:00
|
|
|
|
|
1998-03-09 23:22:44 +00:00
|
|
|
|
if (NILP (current_buffer->enable_multibyte_characters))
|
|
|
|
|
return 0;
|
1999-09-03 01:28:42 +00:00
|
|
|
|
|
|
|
|
|
/* At first, we can exclude the following cases:
|
|
|
|
|
(1) The last byte of STRING is an ASCII.
|
|
|
|
|
(2) POS is the last of the current buffer.
|
|
|
|
|
(3) A character at POS can't be a following byte of multibyte
|
|
|
|
|
character. */
|
|
|
|
|
if (length > 0 && ASCII_BYTE_P (string[length - 1])) /* case (1) */
|
|
|
|
|
return 0;
|
|
|
|
|
if (pos_byte == Z_BYTE) /* case (2) */
|
1998-03-09 23:22:44 +00:00
|
|
|
|
return 0;
|
1999-09-03 01:28:42 +00:00
|
|
|
|
bufp = BYTE_POS_ADDR (pos_byte);
|
|
|
|
|
if (CHAR_HEAD_P (*bufp)) /* case (3) */
|
|
|
|
|
return 0;
|
|
|
|
|
|
1998-03-09 23:22:44 +00:00
|
|
|
|
i = length - 1;
|
1998-09-07 13:39:15 +00:00
|
|
|
|
while (i >= 0 && ! CHAR_HEAD_P (string[i]))
|
1998-03-09 23:22:44 +00:00
|
|
|
|
{
|
|
|
|
|
i--;
|
|
|
|
|
}
|
1998-09-07 13:39:15 +00:00
|
|
|
|
if (i < 0)
|
|
|
|
|
{
|
1999-09-03 01:28:42 +00:00
|
|
|
|
/* All characters in STRING are not character head. We must
|
|
|
|
|
check also preceding bytes at POS. We are sure that the gap
|
|
|
|
|
is at POS. */
|
|
|
|
|
unsigned char *p = BEG_ADDR;
|
1998-09-07 13:39:15 +00:00
|
|
|
|
i = pos_byte - 2;
|
1999-09-03 01:28:42 +00:00
|
|
|
|
while (i >= 0 && ! CHAR_HEAD_P (p[i]))
|
1998-09-07 13:39:15 +00:00
|
|
|
|
i--;
|
1999-09-03 01:28:42 +00:00
|
|
|
|
if (i < 0 || !BASE_LEADING_CODE_P (p[i]))
|
1998-09-07 13:39:15 +00:00
|
|
|
|
return 0;
|
1999-12-15 00:13:49 +00:00
|
|
|
|
|
1999-09-03 01:28:42 +00:00
|
|
|
|
bytes = BYTES_BY_CHAR_HEAD (p[i]);
|
|
|
|
|
return (bytes <= pos_byte - 1 - i + length
|
|
|
|
|
? 0
|
|
|
|
|
: bytes - (pos_byte - 1 - i + length));
|
1998-09-07 13:39:15 +00:00
|
|
|
|
}
|
1999-09-03 01:28:42 +00:00
|
|
|
|
if (!BASE_LEADING_CODE_P (string[i]))
|
1998-03-09 23:22:44 +00:00
|
|
|
|
return 0;
|
|
|
|
|
|
1999-09-03 01:28:42 +00:00
|
|
|
|
bytes = BYTES_BY_CHAR_HEAD (string[i]) - (length - i);
|
|
|
|
|
bufp++, pos_byte++;
|
|
|
|
|
while (!CHAR_HEAD_P (*bufp)) bufp++, pos_byte++;
|
1994-08-28 06:07:37 +00:00
|
|
|
|
|
1999-09-03 01:28:42 +00:00
|
|
|
|
return (bytes <= pos_byte - opos_byte ? bytes : pos_byte - opos_byte);
|
1998-01-09 22:46:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
#endif
|
1998-10-28 07:52:13 +00:00
|
|
|
|
|
1998-03-11 22:08:24 +00:00
|
|
|
|
|
1998-01-09 22:46:07 +00:00
|
|
|
|
/* Insert a sequence of NCHARS chars which occupy NBYTES bytes
|
|
|
|
|
starting at STRING. INHERIT, PREPARE and BEFORE_MARKERS
|
|
|
|
|
are the same as in insert_1. */
|
|
|
|
|
|
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
insert_1_both (const unsigned char *string,
|
|
|
|
|
EMACS_INT nchars, EMACS_INT nbytes,
|
|
|
|
|
int inherit, int prepare, int before_markers)
|
1998-01-09 22:46:07 +00:00
|
|
|
|
{
|
2001-10-26 12:02:42 +00:00
|
|
|
|
if (nchars == 0)
|
|
|
|
|
return;
|
2003-02-04 14:56:31 +00:00
|
|
|
|
|
1998-03-03 07:18:46 +00:00
|
|
|
|
if (NILP (current_buffer->enable_multibyte_characters))
|
|
|
|
|
nchars = nbytes;
|
|
|
|
|
|
1998-04-29 00:20:14 +00:00
|
|
|
|
if (prepare)
|
|
|
|
|
/* Do this before moving and increasing the gap,
|
|
|
|
|
because the before-change hooks might move the gap
|
|
|
|
|
or make it smaller. */
|
|
|
|
|
prepare_to_modify_buffer (PT, PT, NULL);
|
|
|
|
|
|
1998-01-09 22:46:07 +00:00
|
|
|
|
if (PT != GPT)
|
|
|
|
|
move_gap_both (PT, PT_BYTE);
|
|
|
|
|
if (GAP_SIZE < nbytes)
|
|
|
|
|
make_gap (nbytes - GAP_SIZE);
|
|
|
|
|
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
#ifdef BYTE_COMBINING_DEBUG
|
|
|
|
|
if (count_combining_before (string, nbytes, PT, PT_BYTE)
|
|
|
|
|
|| count_combining_after (string, nbytes, PT, PT_BYTE))
|
|
|
|
|
abort ();
|
|
|
|
|
#endif
|
1998-03-09 23:22:44 +00:00
|
|
|
|
|
|
|
|
|
/* Record deletion of the surrounding text that combines with
|
|
|
|
|
the insertion. This, together with recording the insertion,
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
will add up to the right stuff in the undo list. */
|
|
|
|
|
record_insert (PT, nchars);
|
1998-01-09 22:46:07 +00:00
|
|
|
|
MODIFF++;
|
2006-09-01 13:28:13 +00:00
|
|
|
|
CHARS_MODIFF = MODIFF;
|
1998-01-09 22:46:07 +00:00
|
|
|
|
|
|
|
|
|
bcopy (string, GPT_ADDR, nbytes);
|
|
|
|
|
|
|
|
|
|
GAP_SIZE -= nbytes;
|
1998-03-11 22:08:24 +00:00
|
|
|
|
GPT += nchars;
|
|
|
|
|
ZV += nchars;
|
|
|
|
|
Z += nchars;
|
1998-01-09 22:46:07 +00:00
|
|
|
|
GPT_BYTE += nbytes;
|
|
|
|
|
ZV_BYTE += nbytes;
|
|
|
|
|
Z_BYTE += nbytes;
|
|
|
|
|
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
|
1998-03-11 22:08:24 +00:00
|
|
|
|
|
|
|
|
|
if (GPT_BYTE < GPT)
|
|
|
|
|
abort ();
|
|
|
|
|
|
2002-06-13 22:07:13 +00:00
|
|
|
|
/* The insert may have been in the unchanged region, so check again. */
|
|
|
|
|
if (Z - GPT < END_UNCHANGED)
|
|
|
|
|
END_UNCHANGED = Z - GPT;
|
|
|
|
|
|
1998-03-11 22:08:24 +00:00
|
|
|
|
adjust_overlays_for_insert (PT, nchars);
|
1998-03-09 23:22:44 +00:00
|
|
|
|
adjust_markers_for_insert (PT, PT_BYTE,
|
1998-03-11 22:08:24 +00:00
|
|
|
|
PT + nchars, PT_BYTE + nbytes,
|
1998-01-09 22:46:07 +00:00
|
|
|
|
before_markers);
|
1998-03-11 00:47:48 +00:00
|
|
|
|
|
1998-03-11 22:08:24 +00:00
|
|
|
|
if (BUF_INTERVALS (current_buffer) != 0)
|
|
|
|
|
offset_intervals (current_buffer, PT, nchars);
|
|
|
|
|
|
1998-03-11 00:47:48 +00:00
|
|
|
|
if (!inherit && BUF_INTERVALS (current_buffer) != 0)
|
1999-11-26 12:07:04 +00:00
|
|
|
|
set_text_properties (make_number (PT), make_number (PT + nchars),
|
|
|
|
|
Qnil, Qnil, Qnil);
|
1998-03-11 00:47:48 +00:00
|
|
|
|
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
adjust_point (nchars, nbytes);
|
1998-10-24 01:17:09 +00:00
|
|
|
|
|
|
|
|
|
CHECK_MARKERS ();
|
1991-01-05 15:12:15 +00:00
|
|
|
|
}
|
1998-01-01 07:03:19 +00:00
|
|
|
|
|
1992-10-01 00:56:11 +00:00
|
|
|
|
/* Insert the part of the text of STRING, a Lisp object assumed to be
|
1998-01-09 22:46:07 +00:00
|
|
|
|
of type string, consisting of the LENGTH characters (LENGTH_BYTE bytes)
|
|
|
|
|
starting at position POS / POS_BYTE. If the text of STRING has properties,
|
|
|
|
|
copy them into the buffer.
|
1992-10-01 00:56:11 +00:00
|
|
|
|
|
|
|
|
|
It does not work to use `insert' for this, because a GC could happen
|
1991-05-08 06:23:29 +00:00
|
|
|
|
before we bcopy the stuff into the buffer, and relocate the string
|
|
|
|
|
without insert noticing. */
|
1992-10-01 00:56:11 +00:00
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
insert_from_string (Lisp_Object string, EMACS_INT pos, EMACS_INT pos_byte,
|
|
|
|
|
EMACS_INT length, EMACS_INT length_byte, int inherit)
|
1994-04-08 00:44:35 +00:00
|
|
|
|
{
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT opoint = PT;
|
2004-12-02 23:37:13 +00:00
|
|
|
|
|
|
|
|
|
if (SCHARS (string) == 0)
|
|
|
|
|
return;
|
|
|
|
|
|
1998-04-25 23:32:56 +00:00
|
|
|
|
insert_from_string_1 (string, pos, pos_byte, length, length_byte,
|
|
|
|
|
inherit, 0);
|
|
|
|
|
signal_after_change (opoint, 0, PT - opoint);
|
1999-12-15 00:13:49 +00:00
|
|
|
|
update_compositions (opoint, PT, CHECK_BORDER);
|
1994-04-08 00:44:35 +00:00
|
|
|
|
}
|
|
|
|
|
|
1998-01-09 22:46:07 +00:00
|
|
|
|
/* Like `insert_from_string' except that all markers pointing
|
|
|
|
|
at the place where the insertion happens are adjusted to point after it. */
|
1998-01-01 07:03:19 +00:00
|
|
|
|
|
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
insert_from_string_before_markers (Lisp_Object string,
|
|
|
|
|
EMACS_INT pos, EMACS_INT pos_byte,
|
|
|
|
|
EMACS_INT length, EMACS_INT length_byte,
|
|
|
|
|
int inherit)
|
1998-01-01 07:03:19 +00:00
|
|
|
|
{
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT opoint = PT;
|
2004-12-02 23:37:13 +00:00
|
|
|
|
|
|
|
|
|
if (SCHARS (string) == 0)
|
|
|
|
|
return;
|
|
|
|
|
|
1998-04-25 23:32:56 +00:00
|
|
|
|
insert_from_string_1 (string, pos, pos_byte, length, length_byte,
|
|
|
|
|
inherit, 1);
|
|
|
|
|
signal_after_change (opoint, 0, PT - opoint);
|
1999-12-15 00:13:49 +00:00
|
|
|
|
update_compositions (opoint, PT, CHECK_BORDER);
|
1998-01-01 07:03:19 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Subroutine of the insertion functions above. */
|
|
|
|
|
|
|
|
|
|
static void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
insert_from_string_1 (Lisp_Object string, EMACS_INT pos, EMACS_INT pos_byte,
|
|
|
|
|
EMACS_INT nchars, EMACS_INT nbytes,
|
|
|
|
|
int inherit, int before_markers)
|
1991-01-05 15:12:15 +00:00
|
|
|
|
{
|
|
|
|
|
struct gcpro gcpro1;
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT outgoing_nbytes = nbytes;
|
1998-03-11 00:47:48 +00:00
|
|
|
|
INTERVAL intervals;
|
1998-01-09 22:46:07 +00:00
|
|
|
|
|
|
|
|
|
/* Make OUTGOING_NBYTES describe the text
|
|
|
|
|
as it will be inserted in this buffer. */
|
|
|
|
|
|
|
|
|
|
if (NILP (current_buffer->enable_multibyte_characters))
|
|
|
|
|
outgoing_nbytes = nchars;
|
1998-03-21 17:48:54 +00:00
|
|
|
|
else if (! STRING_MULTIBYTE (string))
|
1998-01-09 22:46:07 +00:00
|
|
|
|
outgoing_nbytes
|
2002-07-16 15:49:24 +00:00
|
|
|
|
= count_size_as_multibyte (SDATA (string) + pos_byte,
|
1998-01-09 22:46:07 +00:00
|
|
|
|
nbytes);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
|
|
|
|
GCPRO1 (string);
|
1998-04-29 00:20:14 +00:00
|
|
|
|
/* Do this before moving and increasing the gap,
|
|
|
|
|
because the before-change hooks might move the gap
|
|
|
|
|
or make it smaller. */
|
1997-06-25 06:50:16 +00:00
|
|
|
|
prepare_to_modify_buffer (PT, PT, NULL);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1994-04-26 02:11:35 +00:00
|
|
|
|
if (PT != GPT)
|
1998-01-01 07:03:19 +00:00
|
|
|
|
move_gap_both (PT, PT_BYTE);
|
1999-08-04 11:26:17 +00:00
|
|
|
|
if (GAP_SIZE < outgoing_nbytes)
|
1998-01-09 22:46:07 +00:00
|
|
|
|
make_gap (outgoing_nbytes - GAP_SIZE);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
UNGCPRO;
|
|
|
|
|
|
1998-01-09 22:46:07 +00:00
|
|
|
|
/* Copy the string text into the buffer, perhaps converting
|
|
|
|
|
between single-byte and multibyte. */
|
2002-07-15 00:01:34 +00:00
|
|
|
|
copy_text (SDATA (string) + pos_byte, GPT_ADDR, nbytes,
|
1998-03-21 17:48:54 +00:00
|
|
|
|
STRING_MULTIBYTE (string),
|
1998-01-09 22:46:07 +00:00
|
|
|
|
! NILP (current_buffer->enable_multibyte_characters));
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
#ifdef BYTE_COMBINING_DEBUG
|
1998-03-09 23:22:44 +00:00
|
|
|
|
/* 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. */
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
if (count_combining_before (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE)
|
|
|
|
|
|| count_combining_after (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE))
|
|
|
|
|
abort ();
|
|
|
|
|
#endif
|
1998-03-09 23:22:44 +00:00
|
|
|
|
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
record_insert (PT, nchars);
|
1998-03-09 23:22:44 +00:00
|
|
|
|
MODIFF++;
|
2006-09-01 13:28:13 +00:00
|
|
|
|
CHARS_MODIFF = MODIFF;
|
1998-03-09 23:22:44 +00:00
|
|
|
|
|
1998-01-12 05:49:45 +00:00
|
|
|
|
GAP_SIZE -= outgoing_nbytes;
|
1998-03-11 22:08:24 +00:00
|
|
|
|
GPT += nchars;
|
|
|
|
|
ZV += nchars;
|
|
|
|
|
Z += nchars;
|
1998-01-09 22:46:07 +00:00
|
|
|
|
GPT_BYTE += outgoing_nbytes;
|
|
|
|
|
ZV_BYTE += outgoing_nbytes;
|
|
|
|
|
Z_BYTE += outgoing_nbytes;
|
1997-02-20 06:50:03 +00:00
|
|
|
|
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
|
1998-01-01 07:03:19 +00:00
|
|
|
|
|
|
|
|
|
if (GPT_BYTE < GPT)
|
|
|
|
|
abort ();
|
1992-10-01 00:56:11 +00:00
|
|
|
|
|
2002-06-13 22:07:13 +00:00
|
|
|
|
/* The insert may have been in the unchanged region, so check again. */
|
|
|
|
|
if (Z - GPT < END_UNCHANGED)
|
|
|
|
|
END_UNCHANGED = Z - GPT;
|
|
|
|
|
|
1998-03-11 22:08:24 +00:00
|
|
|
|
adjust_overlays_for_insert (PT, nchars);
|
|
|
|
|
adjust_markers_for_insert (PT, PT_BYTE, PT + nchars,
|
|
|
|
|
PT_BYTE + outgoing_nbytes,
|
|
|
|
|
before_markers);
|
1998-03-11 00:47:48 +00:00
|
|
|
|
|
1998-03-11 22:08:24 +00:00
|
|
|
|
offset_intervals (current_buffer, PT, nchars);
|
|
|
|
|
|
2002-07-15 00:01:34 +00:00
|
|
|
|
intervals = STRING_INTERVALS (string);
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
/* Get the intervals for the part of the string we are inserting. */
|
2002-07-15 00:01:34 +00:00
|
|
|
|
if (nbytes < SBYTES (string))
|
1998-03-11 22:08:24 +00:00
|
|
|
|
intervals = copy_intervals (intervals, pos, nchars);
|
2003-02-04 14:56:31 +00:00
|
|
|
|
|
1998-03-11 00:47:48 +00:00
|
|
|
|
/* Insert those intervals. */
|
1998-03-11 22:08:24 +00:00
|
|
|
|
graft_intervals_into_buffer (intervals, PT, nchars,
|
1993-09-14 12:08:02 +00:00
|
|
|
|
current_buffer, inherit);
|
1998-03-11 00:47:48 +00:00
|
|
|
|
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
adjust_point (nchars, outgoing_nbytes);
|
2003-09-08 12:53:41 +00:00
|
|
|
|
|
|
|
|
|
CHECK_MARKERS ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Insert a sequence of NCHARS chars which occupy NBYTES bytes
|
|
|
|
|
starting at GPT_ADDR. */
|
|
|
|
|
|
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
insert_from_gap (EMACS_INT nchars, EMACS_INT nbytes)
|
2003-09-08 12:53:41 +00:00
|
|
|
|
{
|
|
|
|
|
if (NILP (current_buffer->enable_multibyte_characters))
|
|
|
|
|
nchars = nbytes;
|
|
|
|
|
|
|
|
|
|
record_insert (GPT, nchars);
|
|
|
|
|
MODIFF++;
|
|
|
|
|
|
|
|
|
|
GAP_SIZE -= nbytes;
|
|
|
|
|
GPT += nchars;
|
|
|
|
|
ZV += nchars;
|
|
|
|
|
Z += nchars;
|
|
|
|
|
GPT_BYTE += nbytes;
|
|
|
|
|
ZV_BYTE += nbytes;
|
|
|
|
|
Z_BYTE += nbytes;
|
|
|
|
|
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
|
|
|
|
|
|
|
|
|
|
if (GPT_BYTE < GPT)
|
|
|
|
|
abort ();
|
|
|
|
|
|
2003-10-16 00:44:43 +00:00
|
|
|
|
adjust_overlays_for_insert (GPT - nchars, nchars);
|
|
|
|
|
adjust_markers_for_insert (GPT - nchars, GPT_BYTE - nbytes,
|
|
|
|
|
GPT, GPT_BYTE, 0);
|
2003-09-08 12:53:41 +00:00
|
|
|
|
|
|
|
|
|
if (BUF_INTERVALS (current_buffer) != 0)
|
2003-10-16 00:44:43 +00:00
|
|
|
|
{
|
|
|
|
|
offset_intervals (current_buffer, GPT - nchars, nchars);
|
|
|
|
|
graft_intervals_into_buffer (NULL_INTERVAL, GPT - nchars, nchars,
|
|
|
|
|
current_buffer, 0);
|
|
|
|
|
}
|
2003-09-08 12:53:41 +00:00
|
|
|
|
|
|
|
|
|
if (GPT - nchars < PT)
|
|
|
|
|
adjust_point (nchars, nbytes);
|
|
|
|
|
|
|
|
|
|
CHECK_MARKERS ();
|
1991-01-05 15:12:15 +00:00
|
|
|
|
}
|
1998-01-01 07:03:19 +00:00
|
|
|
|
|
|
|
|
|
/* Insert text from BUF, NCHARS characters starting at CHARPOS, into the
|
1994-10-22 04:45:57 +00:00
|
|
|
|
current buffer. If the text in BUF has properties, they are absorbed
|
|
|
|
|
into the current buffer.
|
|
|
|
|
|
|
|
|
|
It does not work to use `insert' for this, because a malloc could happen
|
|
|
|
|
and relocate BUF's text before the bcopy happens. */
|
|
|
|
|
|
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
insert_from_buffer (struct buffer *buf,
|
|
|
|
|
EMACS_INT charpos, EMACS_INT nchars, int inherit)
|
1994-10-22 04:45:57 +00:00
|
|
|
|
{
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT opoint = PT;
|
1998-01-01 07:03:19 +00:00
|
|
|
|
|
1998-04-25 23:32:56 +00:00
|
|
|
|
insert_from_buffer_1 (buf, charpos, nchars, inherit);
|
|
|
|
|
signal_after_change (opoint, 0, PT - opoint);
|
1999-12-15 00:13:49 +00:00
|
|
|
|
update_compositions (opoint, PT, CHECK_BORDER);
|
1994-10-22 04:45:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
insert_from_buffer_1 (struct buffer *buf,
|
|
|
|
|
EMACS_INT from, EMACS_INT nchars, int inherit)
|
1994-10-22 04:45:57 +00:00
|
|
|
|
{
|
1998-05-16 20:34:59 +00:00
|
|
|
|
register Lisp_Object temp;
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
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;
|
1998-03-11 00:47:48 +00:00
|
|
|
|
INTERVAL intervals;
|
1998-01-09 22:46:07 +00:00
|
|
|
|
|
|
|
|
|
/* Make OUTGOING_NBYTES describe the text
|
|
|
|
|
as it will be inserted in this buffer. */
|
|
|
|
|
|
|
|
|
|
if (NILP (current_buffer->enable_multibyte_characters))
|
|
|
|
|
outgoing_nbytes = nchars;
|
|
|
|
|
else if (NILP (buf->enable_multibyte_characters))
|
1998-12-10 03:19:37 +00:00
|
|
|
|
{
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT outgoing_before_gap = 0;
|
|
|
|
|
EMACS_INT outgoing_after_gap = 0;
|
1994-10-22 04:45:57 +00:00
|
|
|
|
|
1998-12-10 03:19:37 +00:00
|
|
|
|
if (from < BUF_GPT (buf))
|
|
|
|
|
{
|
|
|
|
|
chunk = BUF_GPT_BYTE (buf) - from_byte;
|
|
|
|
|
if (chunk > incoming_nbytes)
|
|
|
|
|
chunk = incoming_nbytes;
|
|
|
|
|
outgoing_before_gap
|
|
|
|
|
= count_size_as_multibyte (BUF_BYTE_ADDRESS (buf, from_byte),
|
|
|
|
|
chunk);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
chunk = 0;
|
|
|
|
|
|
|
|
|
|
if (chunk < incoming_nbytes)
|
|
|
|
|
outgoing_after_gap
|
2003-02-04 14:56:31 +00:00
|
|
|
|
= count_size_as_multibyte (BUF_BYTE_ADDRESS (buf,
|
1998-12-10 03:19:37 +00:00
|
|
|
|
from_byte + chunk),
|
|
|
|
|
incoming_nbytes - chunk);
|
|
|
|
|
|
|
|
|
|
outgoing_nbytes = outgoing_before_gap + outgoing_after_gap;
|
|
|
|
|
}
|
2003-02-04 14:56:31 +00:00
|
|
|
|
|
1994-10-22 04:45:57 +00:00
|
|
|
|
/* Make sure point-max won't overflow after this insertion. */
|
1998-01-09 22:46:07 +00:00
|
|
|
|
XSETINT (temp, outgoing_nbytes + Z);
|
|
|
|
|
if (outgoing_nbytes + Z != XINT (temp))
|
1998-01-01 07:03:19 +00:00
|
|
|
|
error ("Maximum buffer size exceeded");
|
1994-10-22 04:45:57 +00:00
|
|
|
|
|
1998-04-29 00:20:14 +00:00
|
|
|
|
/* Do this before moving and increasing the gap,
|
|
|
|
|
because the before-change hooks might move the gap
|
|
|
|
|
or make it smaller. */
|
1997-06-25 06:50:16 +00:00
|
|
|
|
prepare_to_modify_buffer (PT, PT, NULL);
|
1994-10-22 04:45:57 +00:00
|
|
|
|
|
|
|
|
|
if (PT != GPT)
|
1998-01-01 07:03:19 +00:00
|
|
|
|
move_gap_both (PT, PT_BYTE);
|
1998-01-09 22:46:07 +00:00
|
|
|
|
if (GAP_SIZE < outgoing_nbytes)
|
|
|
|
|
make_gap (outgoing_nbytes - GAP_SIZE);
|
1994-10-22 04:45:57 +00:00
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
if (from < BUF_GPT (buf))
|
1994-10-22 04:45:57 +00:00
|
|
|
|
{
|
1998-01-01 07:03:19 +00:00
|
|
|
|
chunk = BUF_GPT_BYTE (buf) - from_byte;
|
1998-01-09 22:46:07 +00:00
|
|
|
|
if (chunk > incoming_nbytes)
|
|
|
|
|
chunk = incoming_nbytes;
|
1998-12-10 03:19:37 +00:00
|
|
|
|
/* Record number of output bytes, so we know where
|
|
|
|
|
to put the output from the second copy_text. */
|
|
|
|
|
chunk_expanded
|
|
|
|
|
= copy_text (BUF_BYTE_ADDRESS (buf, from_byte),
|
|
|
|
|
GPT_ADDR, chunk,
|
|
|
|
|
! NILP (buf->enable_multibyte_characters),
|
|
|
|
|
! NILP (current_buffer->enable_multibyte_characters));
|
1994-10-22 04:45:57 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
1998-12-10 03:19:37 +00:00
|
|
|
|
chunk_expanded = chunk = 0;
|
|
|
|
|
|
1998-01-09 22:46:07 +00:00
|
|
|
|
if (chunk < incoming_nbytes)
|
|
|
|
|
copy_text (BUF_BYTE_ADDRESS (buf, from_byte + chunk),
|
1998-12-10 03:19:37 +00:00
|
|
|
|
GPT_ADDR + chunk_expanded, incoming_nbytes - chunk,
|
1998-01-09 22:46:07 +00:00
|
|
|
|
! NILP (buf->enable_multibyte_characters),
|
|
|
|
|
! NILP (current_buffer->enable_multibyte_characters));
|
1994-10-22 04:45:57 +00:00
|
|
|
|
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
#ifdef BYTE_COMBINING_DEBUG
|
1998-03-09 23:22:44 +00:00
|
|
|
|
/* 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
|
1998-03-11 22:08:24 +00:00
|
|
|
|
have got earlier on. Meanwhile, GPT_ADDR does point to
|
1998-03-09 23:22:44 +00:00
|
|
|
|
the text that has been stored by copy_text. */
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
if (count_combining_before (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE)
|
|
|
|
|
|| count_combining_after (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE))
|
|
|
|
|
abort ();
|
|
|
|
|
#endif
|
1998-03-09 23:22:44 +00:00
|
|
|
|
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
record_insert (PT, nchars);
|
1998-03-09 23:22:44 +00:00
|
|
|
|
MODIFF++;
|
2006-09-01 13:28:13 +00:00
|
|
|
|
CHARS_MODIFF = MODIFF;
|
1998-03-09 23:22:44 +00:00
|
|
|
|
|
1998-01-09 22:46:07 +00:00
|
|
|
|
GAP_SIZE -= outgoing_nbytes;
|
1998-03-11 22:08:24 +00:00
|
|
|
|
GPT += nchars;
|
|
|
|
|
ZV += nchars;
|
|
|
|
|
Z += nchars;
|
1998-01-09 22:46:07 +00:00
|
|
|
|
GPT_BYTE += outgoing_nbytes;
|
|
|
|
|
ZV_BYTE += outgoing_nbytes;
|
|
|
|
|
Z_BYTE += outgoing_nbytes;
|
1997-02-20 06:50:03 +00:00
|
|
|
|
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
|
1998-03-11 22:08:24 +00:00
|
|
|
|
|
|
|
|
|
if (GPT_BYTE < GPT)
|
|
|
|
|
abort ();
|
|
|
|
|
|
2002-06-13 22:07:13 +00:00
|
|
|
|
/* The insert may have been in the unchanged region, so check again. */
|
|
|
|
|
if (Z - GPT < END_UNCHANGED)
|
|
|
|
|
END_UNCHANGED = Z - GPT;
|
|
|
|
|
|
1998-03-11 22:08:24 +00:00
|
|
|
|
adjust_overlays_for_insert (PT, nchars);
|
|
|
|
|
adjust_markers_for_insert (PT, PT_BYTE, PT + nchars,
|
1998-03-09 23:22:44 +00:00
|
|
|
|
PT_BYTE + outgoing_nbytes,
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
0);
|
1998-03-11 00:47:48 +00:00
|
|
|
|
|
1998-03-11 22:08:24 +00:00
|
|
|
|
if (BUF_INTERVALS (current_buffer) != 0)
|
|
|
|
|
offset_intervals (current_buffer, PT, nchars);
|
1998-03-11 00:47:48 +00:00
|
|
|
|
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
/* Get the intervals for the part of the string we are inserting. */
|
1998-03-11 00:47:48 +00:00
|
|
|
|
intervals = BUF_INTERVALS (buf);
|
2008-04-03 20:01:31 +00:00
|
|
|
|
if (nchars < BUF_Z (buf) - BUF_BEG (buf))
|
2000-05-04 21:45:40 +00:00
|
|
|
|
{
|
|
|
|
|
if (buf == current_buffer && PT <= from)
|
|
|
|
|
from += nchars;
|
|
|
|
|
intervals = copy_intervals (intervals, from, nchars);
|
|
|
|
|
}
|
2003-02-04 14:56:31 +00:00
|
|
|
|
|
1998-03-11 00:47:48 +00:00
|
|
|
|
/* Insert those intervals. */
|
1998-03-11 22:08:24 +00:00
|
|
|
|
graft_intervals_into_buffer (intervals, PT, nchars, current_buffer, inherit);
|
1998-03-11 00:47:48 +00:00
|
|
|
|
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
adjust_point (nchars, outgoing_nbytes);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
}
|
|
|
|
|
|
1998-03-30 06:00:54 +00:00
|
|
|
|
/* 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
|
|
|
|
|
GPT_ADDR.
|
|
|
|
|
|
|
|
|
|
PREV_TEXT nil means the new text was just inserted. */
|
1998-02-20 01:40:47 +00:00
|
|
|
|
|
1998-01-22 01:26:45 +00:00
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
adjust_after_replace (EMACS_INT from, EMACS_INT from_byte,
|
|
|
|
|
Lisp_Object prev_text, EMACS_INT len, EMACS_INT len_byte)
|
1998-01-22 01:26:45 +00:00
|
|
|
|
{
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT nchars_del = 0, nbytes_del = 0;
|
1998-03-12 00:42:35 +00:00
|
|
|
|
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
#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
|
|
|
|
|
|
1998-10-24 01:17:09 +00:00
|
|
|
|
if (STRINGP (prev_text))
|
|
|
|
|
{
|
2002-07-15 00:01:34 +00:00
|
|
|
|
nchars_del = SCHARS (prev_text);
|
|
|
|
|
nbytes_del = SBYTES (prev_text);
|
1998-10-24 01:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
1998-03-12 00:42:35 +00:00
|
|
|
|
/* 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. */
|
|
|
|
|
|
2000-05-22 00:19:43 +00:00
|
|
|
|
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);
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
|
1998-10-24 01:17:09 +00:00
|
|
|
|
if (! EQ (current_buffer->undo_list, Qt))
|
|
|
|
|
{
|
|
|
|
|
if (nchars_del > 0)
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
record_delete (from, prev_text);
|
|
|
|
|
record_insert (from, len);
|
1998-10-24 01:17:09 +00:00
|
|
|
|
}
|
1998-03-30 06:00:54 +00:00
|
|
|
|
|
|
|
|
|
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);
|
1998-03-12 00:42:35 +00:00
|
|
|
|
if (BUF_INTERVALS (current_buffer) != 0)
|
1998-08-28 12:33:52 +00:00
|
|
|
|
{
|
|
|
|
|
offset_intervals (current_buffer, from, len - nchars_del);
|
|
|
|
|
}
|
1998-03-12 00:42:35 +00:00
|
|
|
|
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
if (from < PT)
|
|
|
|
|
adjust_point (len - nchars_del, len_byte - nbytes_del);
|
1998-03-12 00:42:35 +00:00
|
|
|
|
|
1998-10-28 07:52:13 +00:00
|
|
|
|
/* As byte combining will decrease Z, we must check this again. */
|
1999-08-23 00:11:45 +00:00
|
|
|
|
if (Z - GPT < END_UNCHANGED)
|
|
|
|
|
END_UNCHANGED = Z - GPT;
|
1998-10-28 07:52:13 +00:00
|
|
|
|
|
1998-03-28 21:52:10 +00:00
|
|
|
|
CHECK_MARKERS ();
|
|
|
|
|
|
1998-01-22 01:26:45 +00:00
|
|
|
|
if (len == 0)
|
2002-01-11 21:29:13 +00:00
|
|
|
|
evaporate_overlays (from);
|
|
|
|
|
MODIFF++;
|
2006-09-01 13:28:13 +00:00
|
|
|
|
CHARS_MODIFF = MODIFF;
|
2002-01-11 21:29:13 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Like adjust_after_replace, but doesn't require PREV_TEXT.
|
|
|
|
|
This is for use when undo is not enabled in the current buffer. */
|
|
|
|
|
|
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
adjust_after_replace_noundo (EMACS_INT from, EMACS_INT from_byte,
|
|
|
|
|
EMACS_INT nchars_del, EMACS_INT nbytes_del,
|
|
|
|
|
EMACS_INT len, EMACS_INT len_byte)
|
2002-01-11 21:29:13 +00:00
|
|
|
|
{
|
|
|
|
|
#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;
|
|
|
|
|
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 (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)
|
|
|
|
|
{
|
|
|
|
|
offset_intervals (current_buffer, from, len - nchars_del);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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)
|
|
|
|
|
END_UNCHANGED = Z - GPT;
|
|
|
|
|
|
|
|
|
|
CHECK_MARKERS ();
|
|
|
|
|
|
|
|
|
|
if (len == 0)
|
1998-01-22 01:26:45 +00:00
|
|
|
|
evaporate_overlays (from);
|
|
|
|
|
MODIFF++;
|
2006-09-01 13:28:13 +00:00
|
|
|
|
CHARS_MODIFF = MODIFF;
|
1998-01-22 01:26:45 +00:00
|
|
|
|
}
|
|
|
|
|
|
1998-03-30 06:00:54 +00:00
|
|
|
|
/* Record undo information, adjust markers and position keepers for an
|
|
|
|
|
insertion of a text from FROM (FROM_BYTE) to TO (TO_BYTE). The
|
|
|
|
|
text already exists in the current buffer but character length (TO
|
|
|
|
|
- FROM) may be incorrect, the correct length is NEWLEN. */
|
|
|
|
|
|
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
adjust_after_insert (EMACS_INT from, EMACS_INT from_byte,
|
|
|
|
|
EMACS_INT to, EMACS_INT to_byte, EMACS_INT newlen)
|
1998-03-30 06:00:54 +00:00
|
|
|
|
{
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT len = to - from, len_byte = to_byte - from_byte;
|
1998-03-30 06:00:54 +00:00
|
|
|
|
|
|
|
|
|
if (GPT != to)
|
|
|
|
|
move_gap_both (to, to_byte);
|
|
|
|
|
GAP_SIZE += len_byte;
|
|
|
|
|
GPT -= len; GPT_BYTE -= len_byte;
|
|
|
|
|
ZV -= len; ZV_BYTE -= len_byte;
|
|
|
|
|
Z -= len; Z_BYTE -= len_byte;
|
|
|
|
|
adjust_after_replace (from, from_byte, Qnil, newlen, len_byte);
|
|
|
|
|
}
|
2004-11-02 09:14:11 +00:00
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
/* Replace the text from character positions FROM to TO with NEW,
|
1997-07-17 06:51:28 +00:00
|
|
|
|
If PREPARE is nonzero, call prepare_to_modify_buffer.
|
|
|
|
|
If INHERIT, the newly inserted text should inherit text properties
|
|
|
|
|
from the surrounding non-deleted text. */
|
|
|
|
|
|
|
|
|
|
/* Note that this does not yet handle markers quite right.
|
|
|
|
|
Also it needs to record a single undo-entry that does a replacement
|
|
|
|
|
rather than a separate delete and insert.
|
1998-08-18 07:00:00 +00:00
|
|
|
|
That way, undo will also handle markers properly.
|
|
|
|
|
|
|
|
|
|
But if MARKERS is 0, don't relocate markers. */
|
1997-07-17 06:51:28 +00:00
|
|
|
|
|
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
replace_range (EMACS_INT from, EMACS_INT to, Lisp_Object new,
|
|
|
|
|
int prepare, int inherit, int markers)
|
1997-07-17 06:51:28 +00:00
|
|
|
|
{
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT inschars = SCHARS (new);
|
|
|
|
|
EMACS_INT insbytes = SBYTES (new);
|
|
|
|
|
EMACS_INT from_byte, to_byte;
|
|
|
|
|
EMACS_INT nbytes_del, nchars_del;
|
1997-07-17 06:51:28 +00:00
|
|
|
|
register Lisp_Object temp;
|
|
|
|
|
struct gcpro gcpro1;
|
1998-03-11 00:47:48 +00:00
|
|
|
|
INTERVAL intervals;
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT outgoing_insbytes = insbytes;
|
1998-09-16 07:21:31 +00:00
|
|
|
|
Lisp_Object deletion;
|
1997-07-17 06:51:28 +00:00
|
|
|
|
|
1998-03-28 21:52:10 +00:00
|
|
|
|
CHECK_MARKERS ();
|
|
|
|
|
|
1997-07-17 06:51:28 +00:00
|
|
|
|
GCPRO1 (new);
|
2000-09-21 20:54:57 +00:00
|
|
|
|
deletion = Qnil;
|
1997-07-17 06:51:28 +00:00
|
|
|
|
|
|
|
|
|
if (prepare)
|
|
|
|
|
{
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT range_length = to - from;
|
1997-07-17 06:51:28 +00:00
|
|
|
|
prepare_to_modify_buffer (from, to, &from);
|
|
|
|
|
to = from + range_length;
|
|
|
|
|
}
|
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
UNGCPRO;
|
|
|
|
|
|
1997-07-17 06:51:28 +00:00
|
|
|
|
/* Make args be valid */
|
|
|
|
|
if (from < BEGV)
|
|
|
|
|
from = BEGV;
|
|
|
|
|
if (to > ZV)
|
|
|
|
|
to = ZV;
|
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
from_byte = CHAR_TO_BYTE (from);
|
|
|
|
|
to_byte = CHAR_TO_BYTE (to);
|
1997-07-17 06:51:28 +00:00
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
nchars_del = to - from;
|
|
|
|
|
nbytes_del = to_byte - from_byte;
|
|
|
|
|
|
|
|
|
|
if (nbytes_del <= 0 && insbytes == 0)
|
|
|
|
|
return;
|
1997-07-17 06:51:28 +00:00
|
|
|
|
|
1998-03-11 22:08:24 +00:00
|
|
|
|
/* Make OUTGOING_INSBYTES describe the text
|
|
|
|
|
as it will be inserted in this buffer. */
|
|
|
|
|
|
|
|
|
|
if (NILP (current_buffer->enable_multibyte_characters))
|
|
|
|
|
outgoing_insbytes = inschars;
|
1998-03-21 17:48:54 +00:00
|
|
|
|
else if (! STRING_MULTIBYTE (new))
|
1998-03-11 22:08:24 +00:00
|
|
|
|
outgoing_insbytes
|
2002-07-15 00:01:34 +00:00
|
|
|
|
= count_size_as_multibyte (SDATA (new), insbytes);
|
1998-03-11 22:08:24 +00:00
|
|
|
|
|
1997-07-17 06:51:28 +00:00
|
|
|
|
/* Make sure point-max won't overflow after this insertion. */
|
1998-01-01 07:03:19 +00:00
|
|
|
|
XSETINT (temp, Z_BYTE - nbytes_del + insbytes);
|
|
|
|
|
if (Z_BYTE - nbytes_del + insbytes != XINT (temp))
|
|
|
|
|
error ("Maximum buffer size exceeded");
|
1997-07-17 06:51:28 +00:00
|
|
|
|
|
|
|
|
|
GCPRO1 (new);
|
|
|
|
|
|
|
|
|
|
/* Make sure the gap is somewhere in or next to what we are deleting. */
|
|
|
|
|
if (from > GPT)
|
1998-01-01 07:03:19 +00:00
|
|
|
|
gap_right (from, from_byte);
|
1997-07-17 06:51:28 +00:00
|
|
|
|
if (to < GPT)
|
1998-01-01 07:03:19 +00:00
|
|
|
|
gap_left (to, to_byte, 0);
|
1997-07-17 06:51:28 +00:00
|
|
|
|
|
1998-10-31 05:12:07 +00:00
|
|
|
|
/* 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. */
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
if (! EQ (current_buffer->undo_list, Qt))
|
|
|
|
|
deletion = make_buffer_string_both (from, from_byte, to, to_byte, 1);
|
1997-07-17 06:51:28 +00:00
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
GAP_SIZE += nbytes_del;
|
|
|
|
|
ZV -= nchars_del;
|
|
|
|
|
Z -= nchars_del;
|
|
|
|
|
ZV_BYTE -= nbytes_del;
|
|
|
|
|
Z_BYTE -= nbytes_del;
|
1997-07-17 06:51:28 +00:00
|
|
|
|
GPT = from;
|
1998-01-01 07:03:19 +00:00
|
|
|
|
GPT_BYTE = from_byte;
|
2004-05-22 22:15:37 +00:00
|
|
|
|
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
|
1997-07-17 06:51:28 +00:00
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
if (GPT_BYTE < GPT)
|
|
|
|
|
abort ();
|
|
|
|
|
|
1999-08-23 00:11:45 +00:00
|
|
|
|
if (GPT - BEG < BEG_UNCHANGED)
|
|
|
|
|
BEG_UNCHANGED = GPT - BEG;
|
|
|
|
|
if (Z - GPT < END_UNCHANGED)
|
|
|
|
|
END_UNCHANGED = Z - GPT;
|
1997-07-17 06:51:28 +00:00
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
if (GAP_SIZE < insbytes)
|
|
|
|
|
make_gap (insbytes - GAP_SIZE);
|
1997-07-17 06:51:28 +00:00
|
|
|
|
|
1998-03-11 22:08:24 +00:00
|
|
|
|
/* Copy the string text into the buffer, perhaps converting
|
|
|
|
|
between single-byte and multibyte. */
|
2002-07-15 00:01:34 +00:00
|
|
|
|
copy_text (SDATA (new), GPT_ADDR, insbytes,
|
1998-03-21 17:48:54 +00:00
|
|
|
|
STRING_MULTIBYTE (new),
|
1998-03-11 22:08:24 +00:00
|
|
|
|
! NILP (current_buffer->enable_multibyte_characters));
|
|
|
|
|
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
#ifdef BYTE_COMBINING_DEBUG
|
1998-08-03 22:25:54 +00:00
|
|
|
|
/* 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
|
1998-03-09 23:22:44 +00:00
|
|
|
|
the text that has been stored by copy_text. */
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
if (count_combining_before (GPT_ADDR, outgoing_insbytes, from, from_byte)
|
|
|
|
|
|| count_combining_after (GPT_ADDR, outgoing_insbytes, from, from_byte))
|
|
|
|
|
abort ();
|
|
|
|
|
#endif
|
1998-03-09 23:22:44 +00:00
|
|
|
|
|
1998-09-16 07:21:31 +00:00
|
|
|
|
if (! EQ (current_buffer->undo_list, Qt))
|
|
|
|
|
{
|
2007-04-29 21:57:33 +00:00
|
|
|
|
/* 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);
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
record_delete (from, deletion);
|
1998-09-16 07:21:31 +00:00
|
|
|
|
}
|
1997-07-17 06:51:28 +00:00
|
|
|
|
|
1998-03-11 22:08:24 +00:00
|
|
|
|
GAP_SIZE -= outgoing_insbytes;
|
|
|
|
|
GPT += inschars;
|
|
|
|
|
ZV += inschars;
|
|
|
|
|
Z += inschars;
|
|
|
|
|
GPT_BYTE += outgoing_insbytes;
|
|
|
|
|
ZV_BYTE += outgoing_insbytes;
|
|
|
|
|
Z_BYTE += outgoing_insbytes;
|
1997-07-17 06:51:28 +00:00
|
|
|
|
if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
|
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
if (GPT_BYTE < GPT)
|
|
|
|
|
abort ();
|
|
|
|
|
|
1997-07-17 06:51:28 +00:00
|
|
|
|
/* Adjust the overlay center as needed. This must be done after
|
|
|
|
|
adjusting the markers that bound the overlays. */
|
1998-01-01 07:03:19 +00:00
|
|
|
|
adjust_overlays_for_delete (from, nchars_del);
|
1998-03-11 22:08:24 +00:00
|
|
|
|
adjust_overlays_for_insert (from, inschars);
|
2001-11-11 20:04:45 +00:00
|
|
|
|
|
|
|
|
|
/* Adjust markers for the deletion and the insertion. */
|
1998-08-18 07:00:00 +00:00
|
|
|
|
if (markers)
|
2001-11-11 20:04:45 +00:00
|
|
|
|
adjust_markers_for_replace (from, from_byte, nchars_del, nbytes_del,
|
|
|
|
|
inschars, outgoing_insbytes);
|
1997-07-17 06:51:28 +00:00
|
|
|
|
|
1998-08-03 22:25:54 +00:00
|
|
|
|
offset_intervals (current_buffer, from, inschars - nchars_del);
|
1998-03-11 00:47:48 +00:00
|
|
|
|
|
|
|
|
|
/* Get the intervals for the part of the string we are inserting--
|
|
|
|
|
not including the combined-before bytes. */
|
2002-07-15 00:01:34 +00:00
|
|
|
|
intervals = STRING_INTERVALS (new);
|
1998-03-11 00:47:48 +00:00
|
|
|
|
/* Insert those intervals. */
|
1998-03-11 22:08:24 +00:00
|
|
|
|
graft_intervals_into_buffer (intervals, from, inschars,
|
1998-03-11 00:47:48 +00:00
|
|
|
|
current_buffer, inherit);
|
1997-07-17 06:51:28 +00:00
|
|
|
|
|
1998-03-11 22:08:24 +00:00
|
|
|
|
/* Relocate point as if it were a marker. */
|
|
|
|
|
if (from < PT)
|
1998-09-08 02:01:59 +00:00
|
|
|
|
adjust_point ((from + inschars - (PT < to ? PT : to)),
|
1998-03-11 22:08:24 +00:00
|
|
|
|
(from_byte + outgoing_insbytes
|
1998-09-08 02:01:59 +00:00
|
|
|
|
- (PT_BYTE < to_byte ? PT_BYTE : to_byte)));
|
1997-07-17 06:51:28 +00:00
|
|
|
|
|
1998-03-11 22:08:24 +00:00
|
|
|
|
if (outgoing_insbytes == 0)
|
|
|
|
|
evaporate_overlays (from);
|
1998-03-10 23:50:30 +00:00
|
|
|
|
|
1998-03-28 21:52:10 +00:00
|
|
|
|
CHECK_MARKERS ();
|
|
|
|
|
|
1997-07-17 06:51:28 +00:00
|
|
|
|
MODIFF++;
|
2006-09-01 13:28:13 +00:00
|
|
|
|
CHARS_MODIFF = MODIFF;
|
1997-07-17 06:51:28 +00:00
|
|
|
|
UNGCPRO;
|
|
|
|
|
|
1998-08-03 22:25:54 +00:00
|
|
|
|
signal_after_change (from, nchars_del, GPT - from);
|
1999-12-15 00:13:49 +00:00
|
|
|
|
update_compositions (from, GPT, CHECK_BORDER);
|
1997-07-17 06:51:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-11-02 09:14:11 +00:00
|
|
|
|
/* 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
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
replace_range_2 (EMACS_INT from, EMACS_INT from_byte,
|
|
|
|
|
EMACS_INT to, EMACS_INT to_byte,
|
|
|
|
|
char *ins, EMACS_INT inschars, EMACS_INT insbytes,
|
|
|
|
|
int markers)
|
2004-11-02 09:14:11 +00:00
|
|
|
|
{
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT nbytes_del, nchars_del;
|
2004-11-02 09:14:11 +00:00
|
|
|
|
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
|
2005-02-01 23:47:06 +00:00
|
|
|
|
&& ! (nchars_del == 1 && inschars == 1 && nbytes_del == insbytes))
|
2004-11-02 09:14:11 +00:00
|
|
|
|
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. */
|
2005-02-01 23:47:06 +00:00
|
|
|
|
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);
|
|
|
|
|
}
|
2004-11-02 09:14:11 +00:00
|
|
|
|
|
|
|
|
|
if (insbytes == 0)
|
|
|
|
|
evaporate_overlays (from);
|
|
|
|
|
|
|
|
|
|
CHECK_MARKERS ();
|
|
|
|
|
|
|
|
|
|
MODIFF++;
|
2006-09-01 13:28:13 +00:00
|
|
|
|
CHARS_MODIFF = MODIFF;
|
2004-11-02 09:14:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
1991-01-05 15:12:15 +00:00
|
|
|
|
/* Delete characters in current buffer
|
1998-01-01 07:03:19 +00:00
|
|
|
|
from FROM up to (but not including) TO.
|
|
|
|
|
If TO comes before FROM, we delete nothing. */
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
del_range (EMACS_INT from, EMACS_INT to)
|
1994-03-02 00:55:05 +00:00
|
|
|
|
{
|
1999-12-07 04:42:40 +00:00
|
|
|
|
del_range_1 (from, to, 1, 0);
|
1994-03-02 00:55:05 +00:00
|
|
|
|
}
|
|
|
|
|
|
1999-12-07 04:42:40 +00:00
|
|
|
|
/* Like del_range; PREPARE says whether to call prepare_to_modify_buffer.
|
|
|
|
|
RET_STRING says to return the deleted text. */
|
1994-03-02 00:55:05 +00:00
|
|
|
|
|
1999-12-07 04:42:40 +00:00
|
|
|
|
Lisp_Object
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
del_range_1 (EMACS_INT from, EMACS_INT to, int prepare, int ret_string)
|
1991-01-05 15:12:15 +00:00
|
|
|
|
{
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT from_byte, to_byte;
|
1999-12-07 04:42:40 +00:00
|
|
|
|
Lisp_Object deletion;
|
|
|
|
|
struct gcpro gcpro1;
|
1998-01-01 07:03:19 +00:00
|
|
|
|
|
|
|
|
|
/* Make args be valid */
|
|
|
|
|
if (from < BEGV)
|
|
|
|
|
from = BEGV;
|
|
|
|
|
if (to > ZV)
|
|
|
|
|
to = ZV;
|
|
|
|
|
|
|
|
|
|
if (to <= from)
|
1999-12-07 04:42:40 +00:00
|
|
|
|
return Qnil;
|
1998-01-01 07:03:19 +00:00
|
|
|
|
|
|
|
|
|
if (prepare)
|
|
|
|
|
{
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT range_length = to - from;
|
1998-01-01 07:03:19 +00:00
|
|
|
|
prepare_to_modify_buffer (from, to, &from);
|
2001-02-13 16:29:20 +00:00
|
|
|
|
to = min (ZV, from + range_length);
|
1998-01-01 07:03:19 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
from_byte = CHAR_TO_BYTE (from);
|
|
|
|
|
to_byte = CHAR_TO_BYTE (to);
|
|
|
|
|
|
1999-12-07 04:42:40 +00:00
|
|
|
|
deletion = del_range_2 (from, from_byte, to, to_byte, ret_string);
|
|
|
|
|
GCPRO1(deletion);
|
1999-01-11 11:42:52 +00:00
|
|
|
|
signal_after_change (from, to - from, 0);
|
2000-02-11 02:20:49 +00:00
|
|
|
|
update_compositions (from, from, CHECK_HEAD);
|
1999-12-07 04:42:40 +00:00
|
|
|
|
UNGCPRO;
|
|
|
|
|
return deletion;
|
1998-01-01 07:03:19 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Like del_range_1 but args are byte positions, not char positions. */
|
|
|
|
|
|
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
del_range_byte (EMACS_INT from_byte, EMACS_INT to_byte, int prepare)
|
1998-01-01 07:03:19 +00:00
|
|
|
|
{
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT from, to;
|
1998-01-01 07:03:19 +00:00
|
|
|
|
|
|
|
|
|
/* Make args be valid */
|
|
|
|
|
if (from_byte < BEGV_BYTE)
|
|
|
|
|
from_byte = BEGV_BYTE;
|
|
|
|
|
if (to_byte > ZV_BYTE)
|
|
|
|
|
to_byte = ZV_BYTE;
|
|
|
|
|
|
|
|
|
|
if (to_byte <= from_byte)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
from = BYTE_TO_CHAR (from_byte);
|
|
|
|
|
to = BYTE_TO_CHAR (to_byte);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1997-06-25 06:50:16 +00:00
|
|
|
|
if (prepare)
|
|
|
|
|
{
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT old_from = from, old_to = Z - to;
|
|
|
|
|
EMACS_INT range_length = to - from;
|
1997-06-25 06:50:16 +00:00
|
|
|
|
prepare_to_modify_buffer (from, to, &from);
|
|
|
|
|
to = from + range_length;
|
1998-01-01 07:03:19 +00:00
|
|
|
|
|
|
|
|
|
if (old_from != from)
|
|
|
|
|
from_byte = CHAR_TO_BYTE (from);
|
2001-02-13 16:29:20 +00:00
|
|
|
|
if (to > ZV)
|
|
|
|
|
{
|
|
|
|
|
to = ZV;
|
|
|
|
|
to_byte = ZV_BYTE;
|
|
|
|
|
}
|
|
|
|
|
else if (old_to == Z - to)
|
1998-01-01 07:03:19 +00:00
|
|
|
|
to_byte = CHAR_TO_BYTE (to);
|
1997-06-25 06:50:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
1999-12-07 04:42:40 +00:00
|
|
|
|
del_range_2 (from, from_byte, to, to_byte, 0);
|
1999-01-11 11:42:52 +00:00
|
|
|
|
signal_after_change (from, to - from, 0);
|
1999-12-15 00:13:49 +00:00
|
|
|
|
update_compositions (from, from, CHECK_HEAD);
|
1998-01-01 07:03:19 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Like del_range_1, but positions are specified both as charpos
|
|
|
|
|
and bytepos. */
|
|
|
|
|
|
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
del_range_both (EMACS_INT from, EMACS_INT from_byte,
|
|
|
|
|
EMACS_INT to, EMACS_INT to_byte, int prepare)
|
1998-01-01 07:03:19 +00:00
|
|
|
|
{
|
1991-01-05 15:12:15 +00:00
|
|
|
|
/* Make args be valid */
|
1998-01-01 07:03:19 +00:00
|
|
|
|
if (from_byte < BEGV_BYTE)
|
|
|
|
|
from_byte = BEGV_BYTE;
|
|
|
|
|
if (to_byte > ZV_BYTE)
|
|
|
|
|
to_byte = ZV_BYTE;
|
|
|
|
|
|
|
|
|
|
if (to_byte <= from_byte)
|
|
|
|
|
return;
|
|
|
|
|
|
1991-01-05 15:12:15 +00:00
|
|
|
|
if (from < BEGV)
|
|
|
|
|
from = BEGV;
|
|
|
|
|
if (to > ZV)
|
|
|
|
|
to = ZV;
|
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
if (prepare)
|
|
|
|
|
{
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT old_from = from, old_to = Z - to;
|
|
|
|
|
EMACS_INT range_length = to - from;
|
1998-01-01 07:03:19 +00:00
|
|
|
|
prepare_to_modify_buffer (from, to, &from);
|
|
|
|
|
to = from + range_length;
|
|
|
|
|
|
|
|
|
|
if (old_from != from)
|
|
|
|
|
from_byte = CHAR_TO_BYTE (from);
|
2001-02-13 16:29:20 +00:00
|
|
|
|
if (to > ZV)
|
|
|
|
|
{
|
|
|
|
|
to = ZV;
|
|
|
|
|
to_byte = ZV_BYTE;
|
|
|
|
|
}
|
|
|
|
|
else if (old_to == Z - to)
|
1998-01-01 07:03:19 +00:00
|
|
|
|
to_byte = CHAR_TO_BYTE (to);
|
|
|
|
|
}
|
|
|
|
|
|
1999-12-07 04:42:40 +00:00
|
|
|
|
del_range_2 (from, from_byte, to, to_byte, 0);
|
1999-01-11 11:42:52 +00:00
|
|
|
|
signal_after_change (from, to - from, 0);
|
1999-12-15 00:13:49 +00:00
|
|
|
|
update_compositions (from, from, CHECK_HEAD);
|
1998-01-01 07:03:19 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Delete a range of text, specified both as character positions
|
|
|
|
|
and byte positions. FROM and TO are character positions,
|
1999-12-07 04:42:40 +00:00
|
|
|
|
while FROM_BYTE and TO_BYTE are byte positions.
|
|
|
|
|
If RET_STRING is true, the deleted area is returned as a string. */
|
1998-01-01 07:03:19 +00:00
|
|
|
|
|
1999-12-07 04:42:40 +00:00
|
|
|
|
Lisp_Object
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
del_range_2 (EMACS_INT from, EMACS_INT from_byte,
|
|
|
|
|
EMACS_INT to, EMACS_INT to_byte, int ret_string)
|
1998-01-01 07:03:19 +00:00
|
|
|
|
{
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
register EMACS_INT nbytes_del, nchars_del;
|
1998-03-21 03:57:35 +00:00
|
|
|
|
Lisp_Object deletion;
|
1998-01-01 07:03:19 +00:00
|
|
|
|
|
1998-03-28 21:52:10 +00:00
|
|
|
|
CHECK_MARKERS ();
|
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
nchars_del = to - from;
|
|
|
|
|
nbytes_del = to_byte - from_byte;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
|
|
|
|
/* Make sure the gap is somewhere in or next to what we are deleting. */
|
|
|
|
|
if (from > GPT)
|
1998-01-01 07:03:19 +00:00
|
|
|
|
gap_right (from, from_byte);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
if (to < GPT)
|
1998-01-01 07:03:19 +00:00
|
|
|
|
gap_left (to, to_byte, 0);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
#ifdef BYTE_COMBINING_DEBUG
|
|
|
|
|
if (count_combining_before (BUF_BYTE_ADDRESS (current_buffer, to_byte),
|
|
|
|
|
Z_BYTE - to_byte, from, from_byte))
|
|
|
|
|
abort ();
|
|
|
|
|
#endif
|
1998-03-21 03:57:35 +00:00
|
|
|
|
|
1999-12-07 04:42:40 +00:00
|
|
|
|
if (ret_string || ! EQ (current_buffer->undo_list, Qt))
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
deletion = make_buffer_string_both (from, from_byte, to, to_byte, 1);
|
1999-12-07 04:42:40 +00:00
|
|
|
|
else
|
|
|
|
|
deletion = Qnil;
|
|
|
|
|
|
1996-02-03 18:06:29 +00:00
|
|
|
|
/* Relocate all markers pointing into the new, larger gap
|
|
|
|
|
to point at the end of the text before the gap.
|
1998-01-01 07:03:19 +00:00
|
|
|
|
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);
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
|
1998-05-16 20:34:59 +00:00
|
|
|
|
if (! EQ (current_buffer->undo_list, Qt))
|
(adjust_markers_for_record_delete): Deleted.
(adjust_markers_for_insert): Argument changed. Caller changed.
(adjust_markers_for_replace): Likewise.
(ADJUST_CHAR_POS, combine_bytes, byte_combining_error,
CHECK_BYTE_COMBINING_FOR_INSERT): Deleted.
(copy_text): Delete unused local varialbe c_save. For converting
to multibyte, be sure to make all 8-bit characters in valid
multibyte form.
(count_size_as_multibyte): Handle 8-bit characters correctly.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2)
[BYTE_COMBINING_DEBUG]: Abort if byte combining occurs.
(insert_1_both, insert_from_string_1, insert_from_buffer_1,
adjust_after_replace, replace_range, del_range_2) Delete codes for
handling byte combining.
(adjust_before_replace): Deleted.
2000-05-20 00:01:34 +00:00
|
|
|
|
record_delete (from, deletion);
|
1992-09-28 13:10:15 +00:00
|
|
|
|
MODIFF++;
|
2006-09-01 13:28:13 +00:00
|
|
|
|
CHARS_MODIFF = MODIFF;
|
1992-09-28 13:10:15 +00:00
|
|
|
|
|
1991-01-05 15:12:15 +00:00
|
|
|
|
/* Relocate point as if it were a marker. */
|
1994-04-26 02:11:35 +00:00
|
|
|
|
if (from < PT)
|
1998-01-01 07:03:19 +00:00
|
|
|
|
adjust_point (from - (PT < to ? PT : to),
|
|
|
|
|
from_byte - (PT_BYTE < to_byte ? PT_BYTE : to_byte));
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
offset_intervals (current_buffer, from, - nchars_del);
|
1993-03-01 08:55:35 +00:00
|
|
|
|
|
1995-04-17 23:16:23 +00:00
|
|
|
|
/* Adjust the overlay center as needed. This must be done after
|
1995-07-20 20:02:38 +00:00
|
|
|
|
adjusting the markers that bound the overlays. */
|
1998-03-16 05:51:07 +00:00
|
|
|
|
adjust_overlays_for_delete (from, nchars_del);
|
1995-04-17 23:16:23 +00:00
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
GAP_SIZE += nbytes_del;
|
|
|
|
|
ZV_BYTE -= nbytes_del;
|
|
|
|
|
Z_BYTE -= nbytes_del;
|
|
|
|
|
ZV -= nchars_del;
|
|
|
|
|
Z -= nchars_del;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
GPT = from;
|
1998-01-01 07:03:19 +00:00
|
|
|
|
GPT_BYTE = from_byte;
|
2009-02-22 14:29:25 +00:00
|
|
|
|
if (GAP_SIZE > 0 && !current_buffer->text->inhibit_shrinking)
|
|
|
|
|
/* Put an anchor, unless called from decode_coding_object which
|
|
|
|
|
needs to access the previous gap contents. */
|
|
|
|
|
*(GPT_ADDR) = 0;
|
1998-03-16 05:51:07 +00:00
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
if (GPT_BYTE < GPT)
|
|
|
|
|
abort ();
|
|
|
|
|
|
1999-08-23 00:11:45 +00:00
|
|
|
|
if (GPT - BEG < BEG_UNCHANGED)
|
|
|
|
|
BEG_UNCHANGED = GPT - BEG;
|
|
|
|
|
if (Z - GPT < END_UNCHANGED)
|
|
|
|
|
END_UNCHANGED = Z - GPT;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1998-03-28 21:52:10 +00:00
|
|
|
|
CHECK_MARKERS ();
|
|
|
|
|
|
1994-09-17 01:51:58 +00:00
|
|
|
|
evaporate_overlays (from);
|
1999-12-07 04:42:40 +00:00
|
|
|
|
|
|
|
|
|
return deletion;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
}
|
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
/* 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
|
2006-09-01 13:28:13 +00:00
|
|
|
|
area.
|
|
|
|
|
|
|
|
|
|
If PRESERVE_CHARS_MODIFF is non-zero, do not update CHARS_MODIFF.
|
|
|
|
|
Otherwise set CHARS_MODIFF to the new value of MODIFF. */
|
1998-01-01 07:03:19 +00:00
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
modify_region (struct buffer *buffer, EMACS_INT start, EMACS_INT end,
|
|
|
|
|
int preserve_chars_modiff)
|
1991-01-05 15:12:15 +00:00
|
|
|
|
{
|
1993-05-14 14:43:30 +00:00
|
|
|
|
struct buffer *old_buffer = current_buffer;
|
|
|
|
|
|
|
|
|
|
if (buffer != old_buffer)
|
|
|
|
|
set_buffer_internal (buffer);
|
|
|
|
|
|
1997-06-25 06:50:16 +00:00
|
|
|
|
prepare_to_modify_buffer (start, end, NULL);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1999-08-23 00:11:45 +00:00
|
|
|
|
BUF_COMPUTE_UNCHANGED (buffer, start - 1, end);
|
1993-12-23 01:19:25 +00:00
|
|
|
|
|
1995-01-02 09:21:30 +00:00
|
|
|
|
if (MODIFF <= SAVE_MODIFF)
|
1993-12-23 01:19:25 +00:00
|
|
|
|
record_first_change ();
|
1991-01-05 15:12:15 +00:00
|
|
|
|
MODIFF++;
|
2006-09-01 13:28:13 +00:00
|
|
|
|
if (! preserve_chars_modiff)
|
|
|
|
|
CHARS_MODIFF = MODIFF;
|
1993-05-14 14:43:30 +00:00
|
|
|
|
|
1995-01-27 07:47:15 +00:00
|
|
|
|
buffer->point_before_scroll = Qnil;
|
|
|
|
|
|
1993-05-14 14:43:30 +00:00
|
|
|
|
if (buffer != old_buffer)
|
|
|
|
|
set_buffer_internal (old_buffer);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
}
|
1997-06-25 06:50:16 +00:00
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
/* Check that it is okay to modify the buffer between START and END,
|
|
|
|
|
which are char positions.
|
|
|
|
|
|
1992-10-01 00:56:11 +00:00
|
|
|
|
Run the before-change-function, if any. If intervals are in use,
|
|
|
|
|
verify that the text to be modified is not read-only, and call
|
1997-06-25 06:50:16 +00:00
|
|
|
|
any modification properties the text may have.
|
|
|
|
|
|
|
|
|
|
If PRESERVE_PTR is nonzero, we relocate *PRESERVE_PTR
|
|
|
|
|
by holding its value temporarily in a marker. */
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
2009-03-28 04:53:04 +00:00
|
|
|
|
prepare_to_modify_buffer (EMACS_INT start, EMACS_INT end,
|
|
|
|
|
EMACS_INT *preserve_ptr)
|
1991-01-05 15:12:15 +00:00
|
|
|
|
{
|
2006-07-05 16:05:02 +00:00
|
|
|
|
struct buffer *base_buffer;
|
|
|
|
|
|
1992-01-13 21:48:03 +00:00
|
|
|
|
if (!NILP (current_buffer->read_only))
|
1991-01-05 15:12:15 +00:00
|
|
|
|
Fbarf_if_buffer_read_only ();
|
|
|
|
|
|
1999-07-21 21:43:52 +00:00
|
|
|
|
/* Let redisplay consider other windows than selected_window
|
|
|
|
|
if modifying another buffer. */
|
|
|
|
|
if (XBUFFER (XWINDOW (selected_window)->buffer) != current_buffer)
|
|
|
|
|
++windows_or_buffers_changed;
|
|
|
|
|
|
1995-01-02 09:21:30 +00:00
|
|
|
|
if (BUF_INTERVALS (current_buffer) != 0)
|
1997-06-25 06:50:16 +00:00
|
|
|
|
{
|
|
|
|
|
if (preserve_ptr)
|
|
|
|
|
{
|
|
|
|
|
Lisp_Object preserve_marker;
|
|
|
|
|
struct gcpro gcpro1;
|
|
|
|
|
preserve_marker = Fcopy_marker (make_number (*preserve_ptr), Qnil);
|
|
|
|
|
GCPRO1 (preserve_marker);
|
|
|
|
|
verify_interval_modification (current_buffer, start, end);
|
|
|
|
|
*preserve_ptr = marker_position (preserve_marker);
|
2003-06-26 23:17:29 +00:00
|
|
|
|
unchain_marker (XMARKER (preserve_marker));
|
1997-06-25 06:50:16 +00:00
|
|
|
|
UNGCPRO;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
verify_interval_modification (current_buffer, start, end);
|
|
|
|
|
}
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
2006-07-05 16:05:02 +00:00
|
|
|
|
/* 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;
|
|
|
|
|
|
1991-01-05 15:12:15 +00:00
|
|
|
|
#ifdef CLASH_DETECTION
|
2006-07-05 16:05:02 +00:00
|
|
|
|
if (!NILP (base_buffer->file_truename)
|
1995-07-20 20:47:20 +00:00
|
|
|
|
/* Make binding buffer-file-name to nil effective. */
|
2006-07-05 16:05:02 +00:00
|
|
|
|
&& !NILP (base_buffer->filename)
|
1995-01-02 09:21:30 +00:00
|
|
|
|
&& SAVE_MODIFF >= MODIFF)
|
2006-07-05 16:05:02 +00:00
|
|
|
|
lock_file (base_buffer->file_truename);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
#else
|
|
|
|
|
/* At least warn if this file has changed on disk since it was visited. */
|
2006-07-05 16:05:02 +00:00
|
|
|
|
if (!NILP (base_buffer->filename)
|
1995-01-02 09:21:30 +00:00
|
|
|
|
&& SAVE_MODIFF >= MODIFF
|
1992-01-13 21:48:03 +00:00
|
|
|
|
&& NILP (Fverify_visited_file_modtime (Fcurrent_buffer ()))
|
2006-07-05 16:05:02 +00:00
|
|
|
|
&& !NILP (Ffile_exists_p (base_buffer->filename)))
|
1991-01-05 15:12:15 +00:00
|
|
|
|
call1 (intern ("ask-user-about-supersession-threat"),
|
2006-07-05 16:05:02 +00:00
|
|
|
|
base_buffer->filename);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
#endif /* not CLASH_DETECTION */
|
|
|
|
|
|
1997-06-25 06:50:16 +00:00
|
|
|
|
signal_before_change (start, end, preserve_ptr);
|
1993-03-07 09:33:13 +00:00
|
|
|
|
|
1994-10-08 22:14:58 +00:00
|
|
|
|
if (current_buffer->newline_cache)
|
|
|
|
|
invalidate_region_cache (current_buffer,
|
|
|
|
|
current_buffer->newline_cache,
|
|
|
|
|
start - BEG, Z - end);
|
|
|
|
|
if (current_buffer->width_run_cache)
|
|
|
|
|
invalidate_region_cache (current_buffer,
|
|
|
|
|
current_buffer->width_run_cache,
|
|
|
|
|
start - BEG, Z - end);
|
|
|
|
|
|
1993-03-07 09:33:13 +00:00
|
|
|
|
Vdeactivate_mark = Qt;
|
1991-01-05 15:12:15 +00:00
|
|
|
|
}
|
|
|
|
|
|
1997-06-25 06:50:16 +00:00
|
|
|
|
/* These macros work with an argument named `preserve_ptr'
|
|
|
|
|
and a local variable named `preserve_marker'. */
|
|
|
|
|
|
|
|
|
|
#define PRESERVE_VALUE \
|
|
|
|
|
if (preserve_ptr && NILP (preserve_marker)) \
|
|
|
|
|
preserve_marker = Fcopy_marker (make_number (*preserve_ptr), Qnil)
|
|
|
|
|
|
|
|
|
|
#define RESTORE_VALUE \
|
|
|
|
|
if (! NILP (preserve_marker)) \
|
|
|
|
|
{ \
|
|
|
|
|
*preserve_ptr = marker_position (preserve_marker); \
|
2003-06-26 23:17:29 +00:00
|
|
|
|
unchain_marker (XMARKER (preserve_marker)); \
|
1997-06-25 06:50:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
1997-08-13 04:13:22 +00:00
|
|
|
|
#define PRESERVE_START_END \
|
|
|
|
|
if (NILP (start_marker)) \
|
|
|
|
|
start_marker = Fcopy_marker (start, Qnil); \
|
|
|
|
|
if (NILP (end_marker)) \
|
|
|
|
|
end_marker = Fcopy_marker (end, Qnil);
|
|
|
|
|
|
|
|
|
|
#define FETCH_START \
|
|
|
|
|
(! NILP (start_marker) ? Fmarker_position (start_marker) : start)
|
|
|
|
|
|
|
|
|
|
#define FETCH_END \
|
|
|
|
|
(! NILP (end_marker) ? Fmarker_position (end_marker) : end)
|
|
|
|
|
|
2007-08-13 04:04:39 +00:00
|
|
|
|
/* Set a variable to nil if an error occurred.
|
2007-08-15 20:05:40 +00:00
|
|
|
|
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). */
|
2007-08-13 04:04:39 +00:00
|
|
|
|
Lisp_Object
|
|
|
|
|
reset_var_on_error (val)
|
|
|
|
|
Lisp_Object val;
|
|
|
|
|
{
|
|
|
|
|
if (NILP (XCDR (val)))
|
|
|
|
|
Fset (XCAR (val), Qnil);
|
|
|
|
|
return Qnil;
|
|
|
|
|
}
|
|
|
|
|
|
1993-06-09 11:59:12 +00:00
|
|
|
|
/* Signal a change to the buffer immediately before it happens.
|
1997-06-25 06:50:16 +00:00
|
|
|
|
START_INT and END_INT are the bounds of the text to be changed.
|
|
|
|
|
|
|
|
|
|
If PRESERVE_PTR is nonzero, we relocate *PRESERVE_PTR
|
|
|
|
|
by holding its value temporarily in a marker. */
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
signal_before_change (EMACS_INT start_int, EMACS_INT end_int,
|
2009-03-28 04:53:04 +00:00
|
|
|
|
EMACS_INT *preserve_ptr)
|
1991-01-05 15:12:15 +00:00
|
|
|
|
{
|
1996-09-04 03:34:04 +00:00
|
|
|
|
Lisp_Object start, end;
|
1997-08-13 04:13:22 +00:00
|
|
|
|
Lisp_Object start_marker, end_marker;
|
1997-06-25 06:50:16 +00:00
|
|
|
|
Lisp_Object preserve_marker;
|
1997-08-13 04:13:22 +00:00
|
|
|
|
struct gcpro gcpro1, gcpro2, gcpro3;
|
2007-08-13 04:04:39 +00:00
|
|
|
|
int count = SPECPDL_INDEX ();
|
1996-09-04 03:34:04 +00:00
|
|
|
|
|
1998-10-08 06:45:36 +00:00
|
|
|
|
if (inhibit_modification_hooks)
|
|
|
|
|
return;
|
|
|
|
|
|
1996-09-04 03:34:04 +00:00
|
|
|
|
start = make_number (start_int);
|
|
|
|
|
end = make_number (end_int);
|
1997-06-25 06:50:16 +00:00
|
|
|
|
preserve_marker = Qnil;
|
1997-08-13 04:13:22 +00:00
|
|
|
|
start_marker = Qnil;
|
|
|
|
|
end_marker = Qnil;
|
|
|
|
|
GCPRO3 (preserve_marker, start_marker, end_marker);
|
1996-09-04 03:34:04 +00:00
|
|
|
|
|
2007-08-13 04:04:39 +00:00
|
|
|
|
specbind (Qinhibit_modification_hooks, Qt);
|
|
|
|
|
|
1991-01-05 15:12:15 +00:00
|
|
|
|
/* If buffer is unmodified, run a special hook for that case. */
|
1995-01-02 09:21:30 +00:00
|
|
|
|
if (SAVE_MODIFF >= MODIFF
|
1993-01-26 01:58:16 +00:00
|
|
|
|
&& !NILP (Vfirst_change_hook)
|
|
|
|
|
&& !NILP (Vrun_hooks))
|
1997-06-25 06:50:16 +00:00
|
|
|
|
{
|
|
|
|
|
PRESERVE_VALUE;
|
1997-08-13 04:13:22 +00:00
|
|
|
|
PRESERVE_START_END;
|
1997-06-25 06:50:16 +00:00
|
|
|
|
call1 (Vrun_hooks, Qfirst_change_hook);
|
|
|
|
|
}
|
1993-01-26 01:58:16 +00:00
|
|
|
|
|
1995-08-05 22:57:13 +00:00
|
|
|
|
/* Now run the before-change-functions if any. */
|
1994-04-10 02:34:02 +00:00
|
|
|
|
if (!NILP (Vbefore_change_functions))
|
|
|
|
|
{
|
1995-08-05 22:57:13 +00:00
|
|
|
|
Lisp_Object args[3];
|
2007-08-13 04:04:39 +00:00
|
|
|
|
Lisp_Object rvoe_arg = Fcons (Qbefore_change_functions, Qnil);
|
1995-08-05 22:57:13 +00:00
|
|
|
|
|
1997-06-25 06:50:16 +00:00
|
|
|
|
PRESERVE_VALUE;
|
1997-08-13 04:13:22 +00:00
|
|
|
|
PRESERVE_START_END;
|
1997-06-25 06:50:16 +00:00
|
|
|
|
|
2007-08-13 04:04:39 +00:00
|
|
|
|
/* Mark before-change-functions to be reset to nil in case of error. */
|
|
|
|
|
record_unwind_protect (reset_var_on_error, rvoe_arg);
|
1995-08-05 22:57:13 +00:00
|
|
|
|
|
|
|
|
|
/* Actually run the hook functions. */
|
|
|
|
|
args[0] = Qbefore_change_functions;
|
1997-08-13 04:13:22 +00:00
|
|
|
|
args[1] = FETCH_START;
|
|
|
|
|
args[2] = FETCH_END;
|
2007-08-13 04:04:39 +00:00
|
|
|
|
Frun_hook_with_args (3, args);
|
1995-08-05 22:57:13 +00:00
|
|
|
|
|
2007-08-13 04:04:39 +00:00
|
|
|
|
/* There was no error: unarm the reset_on_error. */
|
|
|
|
|
XSETCDR (rvoe_arg, Qt);
|
1994-04-10 02:34:02 +00:00
|
|
|
|
}
|
1994-12-11 11:24:16 +00:00
|
|
|
|
|
2003-07-09 14:50:01 +00:00
|
|
|
|
if (current_buffer->overlays_before || current_buffer->overlays_after)
|
1997-06-25 06:50:16 +00:00
|
|
|
|
{
|
|
|
|
|
PRESERVE_VALUE;
|
1997-08-13 04:13:22 +00:00
|
|
|
|
report_overlay_modification (FETCH_START, FETCH_END, 0,
|
|
|
|
|
FETCH_START, FETCH_END, Qnil);
|
1997-06-25 06:50:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
1997-08-13 04:13:22 +00:00
|
|
|
|
if (! NILP (start_marker))
|
|
|
|
|
free_marker (start_marker);
|
|
|
|
|
if (! NILP (end_marker))
|
|
|
|
|
free_marker (end_marker);
|
1997-06-25 06:50:16 +00:00
|
|
|
|
RESTORE_VALUE;
|
|
|
|
|
UNGCPRO;
|
2007-08-13 04:04:39 +00:00
|
|
|
|
|
|
|
|
|
unbind_to (count, Qnil);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
}
|
|
|
|
|
|
1993-06-09 11:59:12 +00:00
|
|
|
|
/* Signal a change immediately after it happens.
|
1998-01-01 07:03:19 +00:00
|
|
|
|
CHARPOS is the character position of the start of the changed text.
|
1991-01-05 15:12:15 +00:00
|
|
|
|
LENDEL is the number of characters of the text before the change.
|
|
|
|
|
(Not the whole buffer; just the part that was changed.)
|
1996-05-01 21:25:49 +00:00
|
|
|
|
LENINS is the number of characters in that part of the text
|
|
|
|
|
after the change. */
|
1991-01-05 15:12:15 +00:00
|
|
|
|
|
1995-01-11 01:40:25 +00:00
|
|
|
|
void
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
signal_after_change (EMACS_INT charpos, EMACS_INT lendel, EMACS_INT lenins)
|
1991-01-05 15:12:15 +00:00
|
|
|
|
{
|
2007-08-13 04:04:39 +00:00
|
|
|
|
int count = SPECPDL_INDEX ();
|
1998-10-08 06:45:36 +00:00
|
|
|
|
if (inhibit_modification_hooks)
|
|
|
|
|
return;
|
|
|
|
|
|
1996-11-09 21:36:00 +00:00
|
|
|
|
/* If we are deferring calls to the after-change functions
|
|
|
|
|
and there are no before-change functions,
|
|
|
|
|
just record the args that we were going to use. */
|
|
|
|
|
if (! NILP (Vcombine_after_change_calls)
|
2000-06-02 12:42:54 +00:00
|
|
|
|
&& NILP (Vbefore_change_functions)
|
2003-07-09 14:50:01 +00:00
|
|
|
|
&& !current_buffer->overlays_before
|
|
|
|
|
&& !current_buffer->overlays_after)
|
1996-11-09 21:36:00 +00:00
|
|
|
|
{
|
|
|
|
|
Lisp_Object elt;
|
|
|
|
|
|
|
|
|
|
if (!NILP (combine_after_change_list)
|
|
|
|
|
&& current_buffer != XBUFFER (combine_after_change_buffer))
|
|
|
|
|
Fcombine_after_change_execute ();
|
|
|
|
|
|
1998-01-01 07:03:19 +00:00
|
|
|
|
elt = Fcons (make_number (charpos - BEG),
|
|
|
|
|
Fcons (make_number (Z - (charpos - lendel + lenins)),
|
1996-11-09 21:36:00 +00:00
|
|
|
|
Fcons (make_number (lenins - lendel), Qnil)));
|
|
|
|
|
combine_after_change_list
|
|
|
|
|
= Fcons (elt, combine_after_change_list);
|
|
|
|
|
combine_after_change_buffer = Fcurrent_buffer ();
|
|
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2003-02-04 14:56:31 +00:00
|
|
|
|
if (!NILP (combine_after_change_list))
|
1996-11-09 21:36:00 +00:00
|
|
|
|
Fcombine_after_change_execute ();
|
|
|
|
|
|
2007-08-13 04:04:39 +00:00
|
|
|
|
specbind (Qinhibit_modification_hooks, Qt);
|
|
|
|
|
|
1994-04-10 02:34:02 +00:00
|
|
|
|
if (!NILP (Vafter_change_functions))
|
|
|
|
|
{
|
1995-08-05 22:57:13 +00:00
|
|
|
|
Lisp_Object args[4];
|
2007-08-13 04:04:39 +00:00
|
|
|
|
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);
|
1995-08-05 22:57:13 +00:00
|
|
|
|
|
|
|
|
|
/* Actually run the hook functions. */
|
|
|
|
|
args[0] = Qafter_change_functions;
|
1998-01-01 07:03:19 +00:00
|
|
|
|
XSETFASTINT (args[1], charpos);
|
|
|
|
|
XSETFASTINT (args[2], charpos + lenins);
|
1995-08-05 22:57:13 +00:00
|
|
|
|
XSETFASTINT (args[3], lendel);
|
2007-08-13 04:04:39 +00:00
|
|
|
|
Frun_hook_with_args (4, args);
|
1995-08-05 22:57:13 +00:00
|
|
|
|
|
2007-08-13 04:04:39 +00:00
|
|
|
|
/* There was no error: unarm the reset_on_error. */
|
|
|
|
|
XSETCDR (rvoe_arg, Qt);
|
1994-04-10 02:34:02 +00:00
|
|
|
|
}
|
1994-12-11 11:24:16 +00:00
|
|
|
|
|
2003-07-09 14:50:01 +00:00
|
|
|
|
if (current_buffer->overlays_before || current_buffer->overlays_after)
|
1998-01-01 07:03:19 +00:00
|
|
|
|
report_overlay_modification (make_number (charpos),
|
|
|
|
|
make_number (charpos + lenins),
|
1994-12-11 11:24:16 +00:00
|
|
|
|
1,
|
1998-01-01 07:03:19 +00:00
|
|
|
|
make_number (charpos),
|
|
|
|
|
make_number (charpos + lenins),
|
1994-12-11 11:24:16 +00:00
|
|
|
|
make_number (lendel));
|
1995-09-12 17:37:02 +00:00
|
|
|
|
|
|
|
|
|
/* After an insertion, call the text properties
|
|
|
|
|
insert-behind-hooks or insert-in-front-hooks. */
|
|
|
|
|
if (lendel == 0)
|
1998-04-14 13:01:05 +00:00
|
|
|
|
report_interval_modification (make_number (charpos),
|
|
|
|
|
make_number (charpos + lenins));
|
2007-08-13 04:04:39 +00:00
|
|
|
|
|
|
|
|
|
unbind_to (count, Qnil);
|
1991-01-05 15:12:15 +00:00
|
|
|
|
}
|
1996-11-09 21:36:00 +00:00
|
|
|
|
|
|
|
|
|
Lisp_Object
|
|
|
|
|
Fcombine_after_change_execute_1 (val)
|
|
|
|
|
Lisp_Object val;
|
|
|
|
|
{
|
|
|
|
|
Vcombine_after_change_calls = val;
|
|
|
|
|
return val;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
DEFUN ("combine-after-change-execute", Fcombine_after_change_execute,
|
2001-11-13 07:48:37 +00:00
|
|
|
|
Scombine_after_change_execute, 0, 0, 0,
|
|
|
|
|
doc: /* This function is for use internally in `combine-after-change-calls'. */)
|
|
|
|
|
()
|
1996-11-09 21:36:00 +00:00
|
|
|
|
{
|
2002-07-11 14:18:02 +00:00
|
|
|
|
int count = SPECPDL_INDEX ();
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT beg, end, change;
|
|
|
|
|
EMACS_INT begpos, endpos;
|
1996-11-09 21:36:00 +00:00
|
|
|
|
Lisp_Object tail;
|
|
|
|
|
|
1998-11-05 20:06:22 +00:00
|
|
|
|
if (NILP (combine_after_change_list))
|
|
|
|
|
return Qnil;
|
|
|
|
|
|
2007-02-28 22:21:25 +00:00
|
|
|
|
/* 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;
|
|
|
|
|
}
|
|
|
|
|
|
1996-11-09 21:36:00 +00:00
|
|
|
|
record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
|
|
|
|
|
|
|
|
|
|
Fset_buffer (combine_after_change_buffer);
|
|
|
|
|
|
|
|
|
|
/* # chars unchanged at beginning of buffer. */
|
|
|
|
|
beg = Z - BEG;
|
|
|
|
|
/* # chars unchanged at end of buffer. */
|
|
|
|
|
end = beg;
|
|
|
|
|
/* Total amount of insertion (negative for deletion). */
|
|
|
|
|
change = 0;
|
|
|
|
|
|
|
|
|
|
/* Scan the various individual changes,
|
|
|
|
|
accumulating the range info in BEG, END and CHANGE. */
|
|
|
|
|
for (tail = combine_after_change_list; CONSP (tail);
|
1999-09-13 02:23:04 +00:00
|
|
|
|
tail = XCDR (tail))
|
1996-11-09 21:36:00 +00:00
|
|
|
|
{
|
1997-04-10 22:37:54 +00:00
|
|
|
|
Lisp_Object elt;
|
* insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point)
(adjust_markers_for_replace, make_gap_larger, make_gap_smaller)
(make_gap, copy_text, count_size_as_multibyte, insert)
(insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit, insert_1)
(count_combining_before, count_combining_after, insert_1_both)
(insert_from_string, insert_from_string_before_markers)
(insert_from_string_1, insert_from_gap, insert_from_buffer)
(insert_from_buffer_1, adjust_after_replace)
(adjust_after_replace_noundo, adjust_after_insert, replace_range)
(replace_range_2, del_range, del_range_1, del_range_byte)
(del_range_both, del_range_2, modify_region)
(prepare_to_modify_buffer, signal_before_change)
(signal_after_change, Fcombine_after_change_execute): Use EMACS_INT
for buffer positions and sizes.
* lisp.h: Adjust prototypes accordingly.
* fileio.c (adjust_markers_for_delete): Move declaration to lisp.h.
(non_regular_inserted, non_regular_nbytes, read_non_regular)
(Finsert_file_contents): Use EMACS_INT for buffer positions.
2009-03-28 02:24:22 +00:00
|
|
|
|
EMACS_INT thisbeg, thisend, thischange;
|
1996-11-09 21:36:00 +00:00
|
|
|
|
|
|
|
|
|
/* Extract the info from the next element. */
|
1999-09-13 02:23:04 +00:00
|
|
|
|
elt = XCAR (tail);
|
1996-11-09 21:36:00 +00:00
|
|
|
|
if (! CONSP (elt))
|
|
|
|
|
continue;
|
1999-09-13 02:23:04 +00:00
|
|
|
|
thisbeg = XINT (XCAR (elt));
|
1996-11-09 21:36:00 +00:00
|
|
|
|
|
1999-09-13 02:23:04 +00:00
|
|
|
|
elt = XCDR (elt);
|
1996-11-09 21:36:00 +00:00
|
|
|
|
if (! CONSP (elt))
|
|
|
|
|
continue;
|
1999-09-13 02:23:04 +00:00
|
|
|
|
thisend = XINT (XCAR (elt));
|
1996-11-09 21:36:00 +00:00
|
|
|
|
|
1999-09-13 02:23:04 +00:00
|
|
|
|
elt = XCDR (elt);
|
1996-11-09 21:36:00 +00:00
|
|
|
|
if (! CONSP (elt))
|
|
|
|
|
continue;
|
1999-09-13 02:23:04 +00:00
|
|
|
|
thischange = XINT (XCAR (elt));
|
1996-11-09 21:36:00 +00:00
|
|
|
|
|
|
|
|
|
/* Merge this range into the accumulated range. */
|
|
|
|
|
change += thischange;
|
|
|
|
|
if (thisbeg < beg)
|
|
|
|
|
beg = thisbeg;
|
|
|
|
|
if (thisend < end)
|
|
|
|
|
end = thisend;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Get the current start and end positions of the range
|
|
|
|
|
that was changed. */
|
|
|
|
|
begpos = BEG + beg;
|
|
|
|
|
endpos = Z - end;
|
2003-02-04 14:56:31 +00:00
|
|
|
|
|
1996-11-09 21:36:00 +00:00
|
|
|
|
/* We are about to handle these, so discard them. */
|
|
|
|
|
combine_after_change_list = Qnil;
|
|
|
|
|
|
|
|
|
|
/* Now run the after-change functions for real.
|
|
|
|
|
Turn off the flag that defers them. */
|
|
|
|
|
record_unwind_protect (Fcombine_after_change_execute_1,
|
|
|
|
|
Vcombine_after_change_calls);
|
|
|
|
|
signal_after_change (begpos, endpos - begpos - change, endpos - begpos);
|
1999-12-15 00:13:49 +00:00
|
|
|
|
update_compositions (begpos, endpos, CHECK_ALL);
|
1996-11-09 21:36:00 +00:00
|
|
|
|
|
1998-11-05 20:06:22 +00:00
|
|
|
|
return unbind_to (count, Qnil);
|
1996-11-09 21:36:00 +00:00
|
|
|
|
}
|
|
|
|
|
|
1998-04-14 12:25:56 +00:00
|
|
|
|
void
|
1996-11-09 21:36:00 +00:00
|
|
|
|
syms_of_insdel ()
|
|
|
|
|
{
|
|
|
|
|
staticpro (&combine_after_change_list);
|
2005-07-23 19:15:47 +00:00
|
|
|
|
staticpro (&combine_after_change_buffer);
|
1996-11-09 21:36:00 +00:00
|
|
|
|
combine_after_change_list = Qnil;
|
1998-11-05 20:06:22 +00:00
|
|
|
|
combine_after_change_buffer = Qnil;
|
1996-11-09 21:36:00 +00:00
|
|
|
|
|
1998-03-28 21:52:10 +00:00
|
|
|
|
DEFVAR_BOOL ("check-markers-debug-flag", &check_markers_debug_flag,
|
2001-11-13 07:48:37 +00:00
|
|
|
|
doc: /* Non-nil means enable debugging checks for invalid marker positions. */);
|
1998-03-28 21:52:10 +00:00
|
|
|
|
check_markers_debug_flag = 0;
|
1996-11-09 21:36:00 +00:00
|
|
|
|
DEFVAR_LISP ("combine-after-change-calls", &Vcombine_after_change_calls,
|
2001-11-13 07:48:37 +00:00
|
|
|
|
doc: /* Used internally by the `combine-after-change-calls' macro. */);
|
1996-11-09 21:36:00 +00:00
|
|
|
|
Vcombine_after_change_calls = Qnil;
|
|
|
|
|
|
1999-09-07 03:25:35 +00:00
|
|
|
|
DEFVAR_BOOL ("inhibit-modification-hooks", &inhibit_modification_hooks,
|
2001-11-13 07:48:37 +00:00
|
|
|
|
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. */);
|
1999-09-07 03:25:35 +00:00
|
|
|
|
inhibit_modification_hooks = 0;
|
* xterm.c (syms_of_xterm):
* xselect.c (syms_of_xselect):
* xmenu.c (syms_of_xmenu):
* xfns.c (syms_of_xfns):
* xfaces.c (syms_of_xfaces):
* xdisp.c (syms_of_xdisp):
* window.c (syms_of_window):
* w32fns.c (syms_of_w32fns):
* undo.c (syms_of_undo):
* textprop.c (syms_of_textprop):
* terminal.c (syms_of_terminal):
* syntax.c (syms_of_syntax):
* sound.c (syms_of_sound):
* search.c (syms_of_search):
* print.c (syms_of_print):
* minibuf.c (syms_of_minibuf):
* macros.c (syms_of_macros):
* keymap.c (syms_of_keymap, initial_define_key)
(initial_define_lispy_key):
* keyboard.c (syms_of_keyboard):
* insdel.c (syms_of_insdel):
* image.c (syms_of_image):
* fringe.c (syms_of_fringe):
* frame.c (syms_of_frame):
* fontset.c (syms_of_fontset):
* fns.c (syms_of_fns):
* fns.c (syms_of_fns):
* fileio.c (syms_of_fileio):
* fileio.c (syms_of_fileio):
* eval.c (syms_of_eval):
* doc.c (syms_of_doc):
* dispnew.c (syms_of_display):
* dired.c (syms_of_dired):
* dbusbind.c (syms_of_dbusbind):
* data.c (syms_of_data):
* composite.c (syms_of_composite):
* coding.c (syms_of_coding):
* cmds.c (syms_of_cmds):
* charset.c (define_charset_internal, syms_of_character):
* ccl.c (syms_of_ccl):
* category.c (syms_of_category, init_category_once):
* casetab.c (syms_of_casetab):
* casefiddle.c (syms_of_casefiddle):
* callint.c (syms_of_callint):
* bytecode.c (syms_of_bytecode):
* buffer.c (keys_of_buffer, syms_of_buffer):
* alloc.c (syms_of_alloc):
* process.c (syms_of_process, init_process):
* lread.c (syms_of_lread, init_obarray):
* font.c (build_style_table):
* emacs.c (syms_of_emacs, main): Replace calls to intern with
intern_c_string, calls to make_pure_string with
make_pure_c_string. Use pure_cons instead of Fcons.
* process.c (socket_options): Make it const.
(set_socket_option, init_process): Use a const pointer.
* lread.c (intern_c_string): New function.
(defvar_kboard, defvar_lisp, defvar_lisp_nopro, defvar_bool)
(defvar_int): Uset it. Make the name const char*.
* font.c (struct table_entry): Remove unused member. Make NAMES
constant.
(weight_table, slant_table, width_table): Make constant.
* emacs.c (struct standard_args): Make name and longname constant.
2009-11-06 06:50:52 +00:00
|
|
|
|
Qinhibit_modification_hooks = intern_c_string ("inhibit-modification-hooks");
|
2001-09-11 12:31:56 +00:00
|
|
|
|
staticpro (&Qinhibit_modification_hooks);
|
1999-09-07 03:25:35 +00:00
|
|
|
|
|
1996-11-09 21:36:00 +00:00
|
|
|
|
defsubr (&Scombine_after_change_execute);
|
|
|
|
|
}
|
2004-04-16 12:51:06 +00:00
|
|
|
|
|
|
|
|
|
/* arch-tag: 9b34b886-47d7-465e-a234-299af411b23d
|
|
|
|
|
(do not change this comment) */
|