diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-07-27 14:33:33 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2019-07-27 20:33:33 +0200 |
| commit | 0e23ee3cc77960f5348dfa6eeb56e97432019126 (patch) | |
| tree | 694a753ed87a6e3691f8712c36c50db11c3530e5 | |
| parent | 997601d966dcc7b10c11eaae9c31bce2441c86da (diff) | |
| download | rneovim-0e23ee3cc77960f5348dfa6eeb56e97432019126.tar.gz rneovim-0e23ee3cc77960f5348dfa6eeb56e97432019126.tar.bz2 rneovim-0e23ee3cc77960f5348dfa6eeb56e97432019126.zip | |
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
| -rw-r--r-- | src/nvim/diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |