forked from aniani/vim
patch 8.0.0360: sometimes VimL is used instead of "Vim script"
Problem: Sometimes VimL is used, which is confusing. Solution: Consistently use "Vim script". (Hirohito Higashi)
This commit is contained in:
@@ -2213,7 +2213,7 @@ test_arglist \
|
||||
test_usercommands \
|
||||
test_utf8 \
|
||||
test_viminfo \
|
||||
test_viml \
|
||||
test_vimscript \
|
||||
test_visual \
|
||||
test_window_cmd \
|
||||
test_window_id \
|
||||
|
@@ -950,7 +950,7 @@ eval_expr(char_u *arg, char_u **nextcmd)
|
||||
|
||||
|
||||
/*
|
||||
* Call some vimL function and return the result in "*rettv".
|
||||
* Call some Vim script function and return the result in "*rettv".
|
||||
* Uses argv[argc] for the function arguments. Only Number and String
|
||||
* arguments are currently supported.
|
||||
* Returns OK or FAIL.
|
||||
@@ -1027,7 +1027,7 @@ call_vim_function(
|
||||
}
|
||||
|
||||
/*
|
||||
* Call vimL function "func" and return the result as a number.
|
||||
* Call Vim script function "func" and return the result as a number.
|
||||
* Returns -1 when calling the function fails.
|
||||
* Uses argv[argc] for the function arguments.
|
||||
*/
|
||||
@@ -1055,7 +1055,7 @@ call_func_retnr(
|
||||
|
||||
# if (defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)) || defined(PROTO)
|
||||
/*
|
||||
* Call vimL function "func" and return the result as a string.
|
||||
* Call Vim script function "func" and return the result as a string.
|
||||
* Returns NULL when calling the function fails.
|
||||
* Uses argv[argc] for the function arguments.
|
||||
*/
|
||||
@@ -1080,7 +1080,7 @@ call_func_retstr(
|
||||
# endif
|
||||
|
||||
/*
|
||||
* Call vimL function "func" and return the result as a List.
|
||||
* Call Vim script function "func" and return the result as a List.
|
||||
* Uses argv[argc] for the function arguments.
|
||||
* Returns NULL when there is something wrong.
|
||||
*/
|
||||
|
@@ -5140,8 +5140,8 @@ expand_shellcmd(
|
||||
static void * call_user_expand_func(void *(*user_expand_func)(char_u *, int, char_u **, int), expand_T *xp, int *num_file, char_u ***file);
|
||||
|
||||
/*
|
||||
* Call "user_expand_func()" to invoke a user defined VimL function and return
|
||||
* the result (either a string or a List).
|
||||
* Call "user_expand_func()" to invoke a user defined Vim script function and
|
||||
* return the result (either a string or a List).
|
||||
*/
|
||||
static void *
|
||||
call_user_expand_func(
|
||||
|
@@ -582,9 +582,9 @@ VimTryStart(void)
|
||||
VimTryEnd(void)
|
||||
{
|
||||
--trylevel;
|
||||
/* Without this it stops processing all subsequent VimL commands and
|
||||
* generates strange error messages if I e.g. try calling Test() in a
|
||||
* cycle */
|
||||
/* Without this it stops processing all subsequent Vim script commands and
|
||||
* generates strange error messages if I e.g. try calling Test() in a cycle
|
||||
*/
|
||||
did_emsg = FALSE;
|
||||
/* Keyboard interrupt should be preferred over anything else */
|
||||
if (got_int)
|
||||
@@ -625,7 +625,7 @@ VimTryEnd(void)
|
||||
discard_current_exception();
|
||||
return -1;
|
||||
}
|
||||
/* Finally transform VimL exception to python one */
|
||||
/* Finally transform Vim script exception to python one */
|
||||
else
|
||||
{
|
||||
PyErr_SetVim((char *)current_exception->value);
|
||||
|
@@ -1449,8 +1449,8 @@ server_parse_message(
|
||||
char_u *enc;
|
||||
|
||||
/*
|
||||
* This is a (n)otification. Sent with serverreply_send in VimL.
|
||||
* Execute any autocommand and save it for later retrieval
|
||||
* This is a (n)otification. Sent with serverreply_send in Vim
|
||||
* script. Execute any autocommand and save it for later retrieval
|
||||
*/
|
||||
p += 2;
|
||||
gotWindow = 0;
|
||||
|
@@ -199,7 +199,7 @@ NEW_TESTS = test_arglist.res \
|
||||
test_undo.res \
|
||||
test_usercommands.res \
|
||||
test_viminfo.res \
|
||||
test_viml.res \
|
||||
test_vimscript.res \
|
||||
test_visual.res \
|
||||
test_window_id.res \
|
||||
test_writefile.res \
|
||||
|
@@ -147,7 +147,7 @@ let s:fail = 0
|
||||
let s:errors = []
|
||||
let s:messages = []
|
||||
let s:skipped = []
|
||||
if expand('%') =~ 'test_viml.vim'
|
||||
if expand('%') =~ 'test_vimscript.vim'
|
||||
" this test has intentional s:errors, don't use try/catch.
|
||||
source %
|
||||
else
|
||||
|
@@ -608,7 +608,7 @@ com! -nargs=1 -bar ExecAsScript call ExecAsScript(<f-args>)
|
||||
" END_OF_TEST_ENVIRONMENT - do not change or remove this line.
|
||||
|
||||
|
||||
" Tests 1 to 15 were moved to test_viml.vim
|
||||
" Tests 1 to 15 were moved to test_vimscript.vim
|
||||
let Xtest = 16
|
||||
|
||||
"-------------------------------------------------------------------------------
|
||||
|
@@ -764,6 +764,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
360,
|
||||
/**/
|
||||
359,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user