From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 5 Nov 2018 20:21:33 +0000 (+0100)
Subject: patch 8.1.0513: no error for set diffopt+=algorithm:
X-Git-Tag: v8.1.0513
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0721058f494143186f66a60151c9634031a8c96;p=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)
---

diff --git a/src/diff.c b/src/diff.c
index c00176134..0399e7967 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -2266,6 +2266,8 @@ diffopt_changed(void)
 		p += 9;
 		diff_algorithm_new = XDF_HISTOGRAM_DIFF;
 	    }
+	    else
+		return FAIL;
 	}
 
 	if (*p != ',' && *p != NUL)
diff --git a/src/testdir/gen_opt_test.vim b/src/testdir/gen_opt_test.vim
index a742153cd..c0e89cfb0 100644
--- a/src/testdir/gen_opt_test.vim
+++ b/src/testdir/gen_opt_test.vim
@@ -81,7 +81,7 @@ let test_values = {
       \ 'cryptmethod': [['', 'zip'], ['xxx']],
       \ 'cscopequickfix': [['', 's-', 's-,c+,e0'], ['xxx', 's,g,d']],
       \ 'debug': [['', 'msg', 'msg', 'beep'], ['xxx']],
-      \ 'diffopt': [['', 'filler', 'icase,iwhite'], ['xxx']],
+      \ 'diffopt': [['', 'filler', 'icase,iwhite'], ['xxx', 'algorithm:xxx', 'algorithm:']],
       \ 'display': [['', 'lastline', 'lastline,uhex'], ['xxx']],
       \ 'eadirection': [['', 'both', 'ver'], ['xxx', 'ver,hor']],
       \ 'encoding': [['latin1'], ['xxx', '']],
diff --git a/src/version.c b/src/version.c
index 363970231..3ed258f69 100644
--- a/src/version.c
+++ b/src/version.c
@@ -792,6 +792,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    513,
 /**/
     512,
 /**/