aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.4.236

Browse Source 
Problem:    It's not that easy to check the Vim patch version.
Solution:   Make has("patch-7.4.123") work. (partly by Marc Weber)
This commit is contained in:
Bram Moolenaar 2014-04-01 22:08:54 +02:00
parent c7f025536e
commit 7f3be402ce
4 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/eval.c
View File

@ -12638,7 +12638,27 @@ f_has(argvars, rettv)
if (n == FALSE)
{
if (STRNICMP(name, "patch", 5) == 0)
n = has_patch(atoi((char *)name + 5));
{
if (name[5] == '-'
&& STRLEN(name) > 11
&& vim_isdigit(name[6])
&& vim_isdigit(name[8])
&& vim_isdigit(name[10]))
{
int major = atoi((char *)name + 6);
int minor = atoi((char *)name + 8);
int patch = atoi((char *)name + 10);
/* Expect "patch-9.9.01234". */
n = (major < VIM_VERSION_MAJOR
|| (major == VIM_VERSION_MAJOR
&& (minor < VIM_VERSION_MINOR
|| (minor == VIM_VERSION_MINOR
&& patch <= highest_patch()))));
}
else
n = has_patch(atoi((char *)name + 5));
}
else if (STRICMP(name, "vim_starting") == 0)
n = (starting != 0);
#ifdef FEAT_MBYTE

12
src/testdir/test60.in
View File

@ -1,4 +1,4 @@
Tests for the exists() function. vim: set ft=vim ts=8 :
Tests for the exists() and has() functions. vim: set ft=vim ts=8 sw=2 :
STARTTEST
:so small.vim
@ -588,6 +588,16 @@ endfunction
redir END
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

5
src/testdir/test60.ok
View File

@ -204,3 +204,8 @@ OK
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

2
src/version.c
View File

@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
236,
/**/
235,
/**/