Mercurial > vim

comparison src/testdir/test_diffmode.vim @ 16135:dc0801e374e0 v8.1.1072

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1072: extending sign and foldcolumn below the text is confusing commit https://github.com/vim/vim/commit/8ee4c01b8c79a29065c1af05e5d9c0721069765f Author: Bram Moolenaar <Bram@vim.org> Date: Fri Mar 29 18:08:18 2019 +0100 patch 8.1.1072: extending sign and foldcolumn below the text is confusing 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)
author Bram Moolenaar <Bram@vim.org>
date Fri, 29 Mar 2019 18:15:05 +0100
parents 360c93a884d0
children 5a2033905f19
comparison
equal deleted inserted replaced
16134:df8cbb1d7755 16135:dc0801e374e0
755 call delete('.Xfile2.swp') 755 call delete('.Xfile2.swp')
756 756
757 " Test 1: Add a line in beginning of file 2 757 " Test 1: Add a line in beginning of file 2
758 call WriteDiffFiles(0, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]) 758 call WriteDiffFiles(0, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
759 let buf = RunVimInTerminal('-d Xfile1 Xfile2', {}) 759 let buf = RunVimInTerminal('-d Xfile1 Xfile2', {})
760 " Set autoread mode, ,so that Vim won't complain once we re-write the test 760 " Set autoread mode, so that Vim won't complain once we re-write the test
761 " files 761 " files
762 call term_sendkeys(buf, ":set autoread\<CR>\<c-w>w:set autoread\<CR>\<c-w>w") 762 call term_sendkeys(buf, ":set autoread\<CR>\<c-w>w:set autoread\<CR>\<c-w>w")
763 763
764 call VerifyBoth(buf, 'Test_diff_01', '') 764 call VerifyBoth(buf, 'Test_diff_01', '')
765 765
913 call writefile([ 913 call writefile([
914 \ 'call setline(1, ["aa","bb","cc","@@ -3,2 +5,7 @@","dd","ee","ff"])', 914 \ 'call setline(1, ["aa","bb","cc","@@ -3,2 +5,7 @@","dd","ee","ff"])',
915 \ 'vnew', 915 \ 'vnew',
916 \ 'call setline(1, ["aa","bb","cc"])', 916 \ 'call setline(1, ["aa","bb","cc"])',
917 \ 'windo diffthis', 917 \ 'windo diffthis',
918 \ '1wincmd w',
919 \ 'setlocal number',
918 \ ], 'Xtest_diff_diff') 920 \ ], 'Xtest_diff_diff')
919 let buf = RunVimInTerminal('-S Xtest_diff_diff', {}) 921 let buf = RunVimInTerminal('-S Xtest_diff_diff', {})
920 922
921 call VerifyScreenDump(buf, 'Test_diff_of_diff_01', {}) 923 call VerifyScreenDump(buf, 'Test_diff_of_diff_01', {})
922 924