diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-12-10 14:08:02 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-12-10 14:08:02 +0200 |
| commit | 3907e630a71d48e693062b350571990d7ba08bbb (patch) | |
| tree | 2be1ecc0796e42c7a453a9fd5131eb5866f79876 /src/insdel.c | |
| parent | cf2d22b874ca2df0072e32ee641e8efffe4abd6d (diff) | |
| parent | 81606b10501169a5671061b8461bbc32dcec8705 (diff) | |
| download | emacs-3907e630a71d48e693062b350571990d7ba08bbb.tar.gz | |
Merge from trunk + rename the event. Not tested yet.
Diffstat (limited to 'src/insdel.c')
| -rw-r--r-- | src/insdel.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/insdel.c b/src/insdel.c index 87010cd8251..892ca3d5216 100644 --- a/src/insdel.c +++ b/src/insdel.c @@ -1755,9 +1755,9 @@ del_range_2 (ptrdiff_t from, ptrdiff_t from_byte, return deletion; } - -/* Call this if you're about to change the region of BUFFER from - character positions START to END. This checks the read-only + +/* Call this if you're about to change the region of current buffer + from character positions START to END. This checks the read-only properties of the region, calls the necessary modification hooks, and warns the next redisplay that it should pay attention to that area. @@ -1766,16 +1766,11 @@ del_range_2 (ptrdiff_t from, ptrdiff_t from_byte, Otherwise set CHARS_MODIFF to the new value of MODIFF. */ void -modify_region (struct buffer *buffer, ptrdiff_t start, ptrdiff_t end, - bool preserve_chars_modiff) +modify_region_1 (ptrdiff_t start, ptrdiff_t end, bool preserve_chars_modiff) { - struct buffer *old_buffer = current_buffer; - - set_buffer_internal (buffer); - prepare_to_modify_buffer (start, end, NULL); - BUF_COMPUTE_UNCHANGED (buffer, start - 1, end); + BUF_COMPUTE_UNCHANGED (current_buffer, start - 1, end); if (MODIFF <= SAVE_MODIFF) record_first_change (); @@ -1783,11 +1778,9 @@ modify_region (struct buffer *buffer, ptrdiff_t start, ptrdiff_t end, if (! preserve_chars_modiff) CHARS_MODIFF = MODIFF; - bset_point_before_scroll (buffer, Qnil); - - set_buffer_internal (old_buffer); + bset_point_before_scroll (current_buffer, Qnil); } - + /* Check that it is okay to modify the buffer between START and END, which are char positions. |