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

patch 8.1.0497: :%diffput changes order of lines

Browse Source 
Problem:    :%diffput changes order of lines. (Markus Braun)
Solution:   Do adjust marks when using internal diff.
This commit is contained in:
Bram Moolenaar
2018-10-25 17:52:23 +02:00
parent c0fe4978f2
commit 5f57bdcab7
3 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/diff.c
View File

@@ -298,9 +298,9 @@ diff_mark_adjust_tp(
// Will update diffs before redrawing. Set _invalid to update the
// diffs themselves, set _update to also update folds properly just
// before redrawing.
// Do update marks here, it is needed for :%diffput.
tp->tp_diff_invalid = TRUE;
tp->tp_diff_update = TRUE;
return;
}
if (line2 == MAXLNUM)
@@ -2850,7 +2850,7 @@ theend:
if (diff_need_update)
ex_diffupdate(NULL);
// Check that the cursor is on a valid character and update it's
// Check that the cursor is on a valid character and update its
// position. When there were filler lines the topline has become
// invalid.
check_cursor();