commit 819821c5a95fc60797ecbb5e5ca1302e397e3d9a
author Bram Moolenaar <Bram@vim.org> Sat Mar 26 21:24:14 2016 +0100
committer Bram Moolenaar <Bram@vim.org> Sat Mar 26 21:24:14 2016 +0100
tree 0d38f7806dc07d66132078c1e5f6d13ebe6bdc9a
parent e1581307d281ceb35726e1b4ca30ef773a2ef23e

patch 7.4.1660
Problem:    has('patch-7.4.1') doesn't work.
Solution:   Fix off-by-one error. (Thinca)

src/eval.c

diff --git a/src/eval.c b/src/eval.c
index c104695..4928907 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -13838,7 +13838,7 @@
 	if (STRNICMP(name, "patch", 5) == 0)
 	{
 	    if (name[5] == '-'
-		    && STRLEN(name) > 11
+		    && STRLEN(name) >= 11
 		    && vim_isdigit(name[6])
 		    && vim_isdigit(name[8])
 		    && vim_isdigit(name[10]))

src/testdir/test60.in

diff --git a/src/testdir/test60.in b/src/testdir/test60.in
index 8835df9..d3b299b 100644
--- a/src/testdir/test60.in
+++ b/src/testdir/test60.in
@@ -589,15 +589,6 @@
 endfunction
 :call TestExists()
 :"
-:function TestHas()
-  redir >> test.out
-  for pl in ['6.9.999', '7.1.999', '7.4.123', '9.1.0', '9.9.1']
-    echo 'has patch ' . pl . ': ' . has('patch-' . pl)
-  endfor
-  redir END
-endfunc
-:call TestHas()
-:"
 :delfunc TestExists
 :delfunc RunTest
 :delfunc TestFuncArg

src/testdir/test60.ok

diff --git a/src/testdir/test60.ok b/src/testdir/test60.ok
index dabcd0c..0c382ad 100644
--- a/src/testdir/test60.ok
+++ b/src/testdir/test60.ok
@@ -204,8 +204,3 @@
  g:footest#x = 1
    footest#F() 0
 UndefFun() 0
-has patch 6.9.999: 1
-has patch 7.1.999: 1
-has patch 7.4.123: 1
-has patch 9.1.0: 0
-has patch 9.9.1: 0

src/testdir/test_expr.vim

diff --git a/src/testdir/test_expr.vim b/src/testdir/test_expr.vim
index 8e55bc5..f5c9e26 100644
--- a/src/testdir/test_expr.vim
+++ b/src/testdir/test_expr.vim
@@ -21,3 +21,18 @@
 
   call assert_fails('echo base.method > instance.method')
 endfunc
+
+func Test_version()
+  call assert_true(has('patch-7.4.001'))
+  call assert_true(has('patch-7.4.01'))
+  call assert_true(has('patch-7.4.1'))
+  call assert_true(has('patch-6.9.999'))
+  call assert_true(has('patch-7.1.999'))
+  call assert_true(has('patch-7.4.123'))
+
+  call assert_false(has('patch-7'))
+  call assert_false(has('patch-7.4'))
+  call assert_false(has('patch-7.4.'))
+  call assert_false(has('patch-9.1.0'))
+  call assert_false(has('patch-9.9.1'))
+endfunc

src/version.c

diff --git a/src/version.c b/src/version.c
index dccdb90..1bd90fa 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1660,
+/**/
     1659,
 /**/
     1658,