mirror of
https://github.com/neovim/neovim.git
synced 2026-01-28 23:56:03 +00:00
vim-patch:8.1.2302: :lockmarks does not work for '[ and ']
Problem: :lockmarks does not work for '[ and '].
Solution: save and restore '[ and '] marks. (James McCoy, closes vim/vim#5222)
f4a1d1c054
Test_diff_maintains_change_mark doesn't actually fail without these changes.
This is fixed in v8.2.3936.
This commit is contained in:
@@ -1146,6 +1146,25 @@ func Test_diff_followwrap()
|
||||
bwipe!
|
||||
endfunc
|
||||
|
||||
func Test_diff_maintains_change_mark()
|
||||
enew!
|
||||
call setline(1, ['a', 'b', 'c', 'd'])
|
||||
diffthis
|
||||
new
|
||||
call setline(1, ['a', 'b', 'c', 'e'])
|
||||
" Set '[ and '] marks
|
||||
2,3yank
|
||||
call assert_equal([2, 3], [line("'["), line("']")])
|
||||
" Verify they aren't affected by the implicit diff
|
||||
diffthis
|
||||
call assert_equal([2, 3], [line("'["), line("']")])
|
||||
" Verify they aren't affected by an explicit diff
|
||||
diffupdate
|
||||
call assert_equal([2, 3], [line("'["), line("']")])
|
||||
bwipe!
|
||||
bwipe!
|
||||
endfunc
|
||||
|
||||
func Test_diff_rnu()
|
||||
CheckScreendump
|
||||
|
||||
|
||||
Reference in New Issue
Block a user