Mercurial > emacs
diff src/insdel.c @ 25373:6e6b29a72e2c
(gap_left): Use BUF_COMPUTE_UNCHANGED.
(gap_right): Ditto.
(modify_region): Ditto.
(gap_left): Compute beg/end_unchanged per buffer.
(gap_right): Ditto.
(adjust_after_replace): Likewise.
(replace_range, del_range_2, modify_region): Likewise.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Mon, 23 Aug 1999 00:11:45 +0000 |
parents | c7247eabc834 |
children | d1fbe67c3f69 |
line wrap: on
line diff
--- a/src/insdel.c Mon Aug 23 00:11:43 1999 +0000 +++ b/src/insdel.c Mon Aug 23 00:11:45 1999 +0000 @@ -139,21 +139,7 @@ int new_s1; if (!newgap) - { - if (unchanged_modified == MODIFF - && overlay_unchanged_modified == OVERLAY_MODIFF) - { - beg_unchanged = charpos - BEG; - end_unchanged = Z - charpos; - } - else - { - if (Z - GPT < end_unchanged) - end_unchanged = Z - GPT; - if (charpos < beg_unchanged) - beg_unchanged = charpos - BEG; - } - } + BUF_COMPUTE_UNCHANGED (current_buffer, charpos, GPT); i = GPT_BYTE; to = GAP_END_ADDR; @@ -228,19 +214,7 @@ register int i; int new_s1; - if (unchanged_modified == MODIFF - && overlay_unchanged_modified == OVERLAY_MODIFF) - { - beg_unchanged = charpos - BEG; - end_unchanged = Z - charpos; - } - else - { - if (Z - charpos - 1 < end_unchanged) - end_unchanged = Z - charpos; - if (GPT - BEG < beg_unchanged) - beg_unchanged = GPT - BEG; - } + BUF_COMPUTE_UNCHANGED (current_buffer, charpos, GPT); i = GPT_BYTE; from = GAP_END_ADDR; @@ -1737,8 +1711,8 @@ } /* As byte combining will decrease Z, we must check this again. */ - if (Z - GPT < end_unchanged) - end_unchanged = Z - GPT; + if (Z - GPT < END_UNCHANGED) + END_UNCHANGED = Z - GPT; CHECK_MARKERS (); @@ -1870,10 +1844,10 @@ if (GPT_BYTE < GPT) abort (); - if (GPT - BEG < beg_unchanged) - beg_unchanged = GPT - BEG; - if (Z - GPT < end_unchanged) - end_unchanged = Z - GPT; + 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); @@ -2019,8 +1993,8 @@ combine_bytes (from, from_byte, combined_before_bytes); /* As byte combining will decrease Z, we must check this again. */ - if (Z - GPT < end_unchanged) - end_unchanged = Z - GPT; + if (Z - GPT < END_UNCHANGED) + END_UNCHANGED = Z - GPT; if (outgoing_insbytes == 0) evaporate_overlays (from); @@ -2259,10 +2233,10 @@ if (GPT_BYTE < GPT) abort (); - if (GPT - BEG < beg_unchanged) - beg_unchanged = GPT - BEG; - if (Z - GPT < end_unchanged) - end_unchanged = Z - GPT; + if (GPT - BEG < BEG_UNCHANGED) + BEG_UNCHANGED = GPT - BEG; + if (Z - GPT < END_UNCHANGED) + END_UNCHANGED = Z - GPT; if (combined_after_bytes) { @@ -2275,8 +2249,8 @@ record_insert (GPT - 1, 1); - if (Z - GPT < end_unchanged) - end_unchanged = Z - GPT; + if (Z - GPT < END_UNCHANGED) + END_UNCHANGED = Z - GPT; } CHECK_MARKERS (); @@ -2302,14 +2276,7 @@ prepare_to_modify_buffer (start, end, NULL); - if (start - 1 < beg_unchanged - || (unchanged_modified == MODIFF - && overlay_unchanged_modified == OVERLAY_MODIFF)) - beg_unchanged = start - 1; - if (Z - end < end_unchanged - || (unchanged_modified == MODIFF - && overlay_unchanged_modified == OVERLAY_MODIFF)) - end_unchanged = Z - end; + BUF_COMPUTE_UNCHANGED (buffer, start - 1, end); if (MODIFF <= SAVE_MODIFF) record_first_change ();