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

patch 8.2.4941: '[ and '] marks may be wrong after undo

Browse Source 
Problem:    '[ and '] marks may be wrong after undo.
Solution:   Adjust the '[ and '] marks if needed. (closes #10407, closes #1281)
This commit is contained in:
LemonBoy
2022-05-12 15:39:31 +01:00
committed by Bram Moolenaar
parent d0132f4862
commit 82444cefa3
3 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/undo.c
View File

@@ -2831,9 +2831,10 @@ u_undoredo(int undo)
if (oldsize > 0 || newsize > 0)
changed_lines(top + 1, 0, bot, newsize - oldsize);
// set '[ and '] mark
// Set the '[ mark.
if (top + 1 < curbuf->b_op_start.lnum)
curbuf->b_op_start.lnum = top + 1;
// Set the '] mark.
if (newsize == 0 && top + 1 > curbuf->b_op_end.lnum)
curbuf->b_op_end.lnum = top + 1;
else if (top + newsize > curbuf->b_op_end.lnum)
@@ -2853,6 +2854,12 @@ u_undoredo(int undo)
newlist = uep;
}
// Ensure the '[ and '] marks are within bounds.
if (curbuf->b_op_start.lnum > curbuf->b_ml.ml_line_count)
curbuf->b_op_start.lnum = curbuf->b_ml.ml_line_count;
if (curbuf->b_op_end.lnum > curbuf->b_ml.ml_line_count)
curbuf->b_op_end.lnum = curbuf->b_ml.ml_line_count;
// Set the cursor to the desired position. Check that the line is valid.
curwin->w_cursor = new_curpos;
check_cursor_lnum();