diff options
| author | Kim F. Storm <storm@cua.dk> | 2002-02-09 22:58:25 +0000 |
|---|---|---|
| committer | Kim F. Storm <storm@cua.dk> | 2002-02-09 22:58:25 +0000 |
| commit | 73df3b72f653c4c6ff557d2165672bab3e80a391 (patch) | |
| tree | 25c0c747070fc5041c70942592ad018fe222ae8a /src/insdel.c | |
| parent | 06f5e6b48fba006c412178dee0b24a5030acd779 (diff) | |
| download | emacs-73df3b72f653c4c6ff557d2165672bab3e80a391.tar.gz | |
(make_gap_smaller): Preserve BEG_UNCHANGED during gap
reduction. This fixes a display problem where stray newlines were
inserted in the window (corrected by C-l). Clarified code (IMHO).
Diffstat (limited to 'src/insdel.c')
| -rw-r--r-- | src/insdel.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/insdel.c b/src/insdel.c index 486875d2b91..365819b2cff 100644 --- a/src/insdel.c +++ b/src/insdel.c @@ -584,7 +584,8 @@ make_gap_smaller (nbytes_removed) int real_gap_loc_byte; int real_Z; int real_Z_byte; - int old_gap_size; + int real_beg_unchanged; + int new_gap_size; /* Make sure the gap is at least 20 bytes. */ if (GAP_SIZE - nbytes_removed < 20) @@ -596,18 +597,19 @@ make_gap_smaller (nbytes_removed) real_gap_loc = GPT; real_gap_loc_byte = GPT_BYTE; - old_gap_size = GAP_SIZE; + new_gap_size = GAP_SIZE - nbytes_removed; real_Z = Z; real_Z_byte = Z_BYTE; + real_beg_unchanged = BEG_UNCHANGED; /* 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. */ - bzero (GPT_ADDR, GAP_SIZE - nbytes_removed); - GPT += GAP_SIZE - nbytes_removed; - GPT_BYTE += GAP_SIZE - nbytes_removed; - Z += GAP_SIZE - nbytes_removed; - Z_BYTE += GAP_SIZE - nbytes_removed; + bzero (GPT_ADDR, new_gap_size); + GPT += new_gap_size; + GPT_BYTE += new_gap_size; + Z += new_gap_size; + Z_BYTE += new_gap_size; GAP_SIZE = nbytes_removed; /* Move the unwanted pretend gap to the end of the buffer. This @@ -617,11 +619,12 @@ make_gap_smaller (nbytes_removed) enlarge_buffer_text (current_buffer, -nbytes_removed); /* Now restore the desired gap. */ - GAP_SIZE = old_gap_size - nbytes_removed; + GAP_SIZE = new_gap_size; GPT = real_gap_loc; GPT_BYTE = real_gap_loc_byte; Z = real_Z; Z_BYTE = real_Z_byte; + BEG_UNCHANGED = real_beg_unchanged; /* Put an anchor. */ *(Z_ADDR) = 0; |