summaryrefslogtreecommitdiffstats
path: root/src/testdir/test_diffmode.vim
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-03-29 18:08:18 +0100
committerBram Moolenaar <Bram@vim.org>2019-03-29 18:08:18 +0100
commit8ee4c01b8c79a29065c1af05e5d9c0721069765f (patch)
tree7b9275c98c4854a599deaaf5bd68ccf15946e9da /src/testdir/test_diffmode.vim
parent2912abb3a2fd72074e3901c8ae1d4a77ce764675 (diff)
patch 8.1.1072: extending sign and foldcolumn below the text is confusingv8.1.1072
Problem: Extending sign and foldcolumn below the text is confusing. Solution: Let the sign and foldcolumn stop at the last text line, just like the line number column. Also stop the command line window leader. (Christian Brabandt, closes #3964)
Diffstat (limited to 'src/testdir/test_diffmode.vim')
-rw-r--r--src/testdir/test_diffmode.vim4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim
index 5a3a6beee4..85963311a5 100644
--- a/src/testdir/test_diffmode.vim
+++ b/src/testdir/test_diffmode.vim
@@ -757,7 +757,7 @@ func Test_diff_screen()
" Test 1: Add a line in beginning of file 2
call WriteDiffFiles(0, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
let buf = RunVimInTerminal('-d Xfile1 Xfile2', {})
- " Set autoread mode, ,so that Vim won't complain once we re-write the test
+ " Set autoread mode, so that Vim won't complain once we re-write the test
" files
call term_sendkeys(buf, ":set autoread\<CR>\<c-w>w:set autoread\<CR>\<c-w>w")
@@ -915,6 +915,8 @@ func Test_diff_of_diff()
\ 'vnew',
\ 'call setline(1, ["aa","bb","cc"])',
\ 'windo diffthis',
+ \ '1wincmd w',
+ \ 'setlocal number',
\ ], 'Xtest_diff_diff')
let buf = RunVimInTerminal('-S Xtest_diff_diff', {})