aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnatolii Sakhnik <sakhnik@gmail.com>2018-12-09 20:17:04 +0200
committerAnatolii Sakhnik <sakhnik@gmail.com>2018-12-09 22:19:41 +0200
commitf273e43cb83c1617969ebd4eaa51aa5bc3f0b855 (patch)
treeed737b28742f6e1ff2cd5fb15d3d8788ecd16f4a /src
parent89eba72792fb9e36ede7e9d58f5673ebfd553178 (diff)
downloadrneovim-f273e43cb83c1617969ebd4eaa51aa5bc3f0b855.tar.gz
rneovim-f273e43cb83c1617969ebd4eaa51aa5bc3f0b855.tar.bz2
rneovim-f273e43cb83c1617969ebd4eaa51aa5bc3f0b855.zip
vim-patch:8.1.0513: no error for set diffopt+=algorithm:
Problem: No error for set diffopt+=algorithm:. Solution: Check for missing argument. (Hirohito Higashi, closes #3598) https://github.com/vim/vim/commit/d0721058f494143186f66a60151c9634031a8c96
Diffstat (limited to 'src')
-rw-r--r--src/nvim/diff.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/nvim/diff.c b/src/nvim/diff.c
index 6dbebd5e29..19751cb73a 100644
--- a/src/nvim/diff.c
+++ b/src/nvim/diff.c
@@ -2165,6 +2165,8 @@ int diffopt_changed(void)
} else if (STRNCMP(p, "histogram", 9) == 0) {
p += 9;
diff_algorithm_new = XDF_HISTOGRAM_DIFF;
+ } else {
+ return FAIL;
}
}