From 0e23ee3cc77960f5348dfa6eeb56e97432019126 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sat, 27 Jul 2019 14:33:33 -0400 Subject: vim-patch:8.1.0956: context:0 in 'diffopt' #10622 Problem: Using context:0 in 'diffopt' does not work well. Solution: Make zero context do the same as one line context. (closes vim/vim#4005) https://github.com/vim/vim/commit/b9ddda6c2d98d99c09d58145c1b5b4042a8fd92c --- src/nvim/diff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/diff.c') diff --git a/src/nvim/diff.c b/src/nvim/diff.c index f2b3abb526..4176769f85 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -2190,7 +2190,7 @@ int diffopt_changed(void) } diff_flags = diff_flags_new; - diff_context = diff_context_new; + diff_context = diff_context_new == 0 ? 1 : diff_context_new; diff_foldcolumn = diff_foldcolumn_new; diff_algorithm = diff_algorithm_new; -- cgit