From b9ddda6c2d98d99c09d58145c1b5b4042a8fd92c Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 19 Feb 2019 23:00:50 +0100 Subject: patch 8.1.0956: using context:0 in 'diffopt' does not work well Problem: Using context:0 in 'diffopt' does not work well. Solution: Make zero context do the same as one line context. (closes #4005) --- src/testdir/test_diffmode.vim | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/testdir/test_diffmode.vim') diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim index 84fb4519c..5a3a6beee 100644 --- a/src/testdir/test_diffmode.vim +++ b/src/testdir/test_diffmode.vim @@ -783,6 +783,17 @@ func Test_diff_screen() call WriteDiffFiles(buf, [1, 2, 3, 4, 4, 5, 6, 7, 8, 9, 10], [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]) call VerifyBoth(buf, 'Test_diff_06', '') + " Variants on test 6 with different context settings + call term_sendkeys(buf, ":set diffopt+=context:2\") + call VerifyScreenDump(buf, 'Test_diff_06.2', {}) + call term_sendkeys(buf, ":set diffopt-=context:2\") + call term_sendkeys(buf, ":set diffopt+=context:1\") + call VerifyScreenDump(buf, 'Test_diff_06.1', {}) + call term_sendkeys(buf, ":set diffopt-=context:1\") + call term_sendkeys(buf, ":set diffopt+=context:0\") + call VerifyScreenDump(buf, 'Test_diff_06.0', {}) + call term_sendkeys(buf, ":set diffopt-=context:0\") + " Test 7 - 9: Test normal/patience/histogram diff algorithm call WriteDiffFiles(buf, ['#include ', '', '// Frobs foo heartily', 'int frobnitz(int foo)', '{', \ ' int i;', ' for(i = 0; i < 10; i++)', ' {', ' printf("Your answer is: ");', -- cgit v1.2.1