version: Allow has("nvim-x"), has("nvim-x.y")

This commit is contained in:
Justin M. Keyes 2016-10-25 13:07:18 +02:00
parent e7e2844d46
commit 714ec09c6d
2 changed files with 4 additions and 5 deletions

View File

@ -10669,11 +10669,9 @@ static void f_has(typval_T *argvars, typval_T *rettv, FunPtr fptr)
} else {
n = has_vim_patch(atoi(name + 5));
}
} else if (STRNICMP(name, "nvim", 4) == 0) {
} else if (STRNICMP(name, "nvim", 4) == 0 && name[4] == '-') {
// Expect "nvim-x.y.z"
if (name[4] == '-' && strlen(name) >= 10) {
n = has_nvim_version(name + 5);
}
n = has_nvim_version(name + 5);
} else if (STRICMP(name, "vim_starting") == 0) {
n = (starting != 0);
} else if (STRICMP(name, "multi_byte_encoding") == 0) {

View File

@ -19,7 +19,6 @@ describe('has()', function()
eq(0, funcs.has("nvim-0.0.c"))
eq(0, funcs.has("nvim-0.b.0"))
eq(0, funcs.has("nvim-a.b.0"))
eq(0, funcs.has("nvim-0.1"))
eq(0, funcs.has("nvim-.0.0.0"))
eq(0, funcs.has("nvim-.0"))
eq(0, funcs.has("nvim-0."))
@ -32,6 +31,8 @@ describe('has()', function()
eq(0, funcs.has("nvim-99.001.05"))
eq(1, funcs.has("nvim"))
eq(1, funcs.has("nvim-0"))
eq(1, funcs.has("nvim-0.1"))
eq(1, funcs.has("nvim-0.0.0"))
eq(1, funcs.has("nvim-0.1.1."))
eq(1, funcs.has("nvim-0.1.1.abc"))