thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.0421: diff mode wrong when adding line at end of buffer

Browse Source 
Problem:    Diff mode is displayed wrong when adding a line at the end of a
            buffer.
Solution:   Adjust marks in diff mode. (James McCoy, closes #1329)
This commit is contained in:
Bram Moolenaar
2017-03-05 18:03:04 +01:00
parent 2c7292dc5b
commit f58a8475e1
4 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ops.c
View File

@@ -3927,9 +3927,13 @@ error:
curbuf->b_op_start.lnum++;
}
/* Skip mark_adjust when adding lines after the last one, there
* can't be marks there. */
* can't be marks there. But still needed in diff mode. */
if (curbuf->b_op_start.lnum + (y_type == MCHAR) - 1 + nr_lines
< curbuf->b_ml.ml_line_count)
< curbuf->b_ml.ml_line_count
#ifdef FEAT_DIFF
|| curwin->w_p_diff
#endif
)
mark_adjust(curbuf->b_op_start.lnum + (y_type == MCHAR),
(linenr_T)MAXLNUM, nr_lines, 0L);
@@ -6311,7 +6315,7 @@ write_viminfo_registers(FILE *fp)
/*
* Routine to export any final X selection we had to the environment
* so that the text is still available after vim has exited. X selections
* so that the text is still available after Vim has exited. X selections
* only exist while the owning application exists, so we write to the
* permanent (while X runs) store CUT_BUFFER0.
* Dump the CLIPBOARD selection if we own it (it's logically the more