diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-11-23 20:49:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-23 20:49:24 -0500 |
| commit | e00bc613250b0986aa16a3b4db0ce1ba78da7631 (patch) | |
| tree | 77de2017ba3c23283d67049c6ed8583fba5b095b /src | |
| parent | b1854cefeaead27c6e53ec9c31b7246cf70d28fc (diff) | |
| parent | d152e2f3fd70fe76a6f6453754c0ed848ccef8c6 (diff) | |
| download | rneovim-e00bc613250b0986aa16a3b4db0ce1ba78da7631.tar.gz rneovim-e00bc613250b0986aa16a3b4db0ce1ba78da7631.tar.bz2 rneovim-e00bc613250b0986aa16a3b4db0ce1ba78da7631.zip | |
Merge pull request #5642 from Shougo/vim-7.4.1660
vim-patch:7.4.1660
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_expr.vim | 15 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 750ef4f94f..fc2f435508 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -10658,7 +10658,7 @@ static void f_has(typval_T *argvars, typval_T *rettv, FunPtr fptr) if (!n) { if (STRNICMP(name, "patch", 5) == 0) { if (name[5] == '-' - && strlen(name) > 11 + && strlen(name) >= 11 && ascii_isdigit(name[6]) && ascii_isdigit(name[8]) && ascii_isdigit(name[10])) { diff --git a/src/nvim/testdir/test_expr.vim b/src/nvim/testdir/test_expr.vim index 7ea4ebc7df..83b5e66fe0 100644 --- a/src/nvim/testdir/test_expr.vim +++ b/src/nvim/testdir/test_expr.vim @@ -1,5 +1,20 @@ " Tests for expressions. +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 + func Test_strgetchar() call assert_equal(char2nr('a'), strgetchar('axb', 0)) call assert_equal(char2nr('x'), strgetchar('axb', 1)) diff --git a/src/nvim/version.c b/src/nvim/version.c index 8bda2f5701..5339daf9d4 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -784,7 +784,7 @@ static int included_patches[] = { 1663, // 1662 NA // 1661 NA - // 1660, + 1660, // 1659 NA 1658, // 1657 NA |