vim-patch:8.0.0360

Problem:    Sometimes VimL is used, which is confusing.
Solution:   Consistently use "Vim script". (Hirohito Higashi)

b544f3c81f
This commit is contained in:
James McCoy
2017-06-05 23:05:28 -04:00
parent 0088ed0f1a
commit cb8efa4fef
9 changed files with 16 additions and 18 deletions

View File

@@ -1189,7 +1189,7 @@ int get_spellword(list_T *list, const char **pp)
}
// 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.
//
@@ -1257,7 +1257,7 @@ int 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.
*/
@@ -1281,7 +1281,7 @@ call_func_retnr (
return retval;
}
/// Call VimL function and return the result as a string
/// Call Vim script function and return the result as a string
///
/// @param[in] func Function name.
/// @param[in] argc Number of arguments.
@@ -1308,7 +1308,7 @@ char *call_func_retstr(const char *const func, const int argc,
}
/*
* 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.
*/

View File

@@ -4174,10 +4174,8 @@ static void expand_shellcmd(char_u *filepat, 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(user_expand_func_T user_expand_func,
expand_T *xp, int *num_file, char_u ***file)
{

View File

@@ -67,7 +67,7 @@ NEW_TESTS ?= \
test_timers.res \
test_undo.res \
test_usercommands.res \
test_viml.res \
test_vimscript.res \
test_visual.res \
test_window_id.res \
test_writefile.res \

View File

@@ -121,7 +121,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

View File

@@ -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
"-------------------------------------------------------------------------------