diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/eval.c | 8 | ||||
| -rw-r--r-- | src/ex_getln.c | 4 | ||||
| -rw-r--r-- | src/if_py_both.h | 8 | ||||
| -rw-r--r-- | src/if_xcmdsrv.c | 4 | ||||
| -rw-r--r-- | src/testdir/Make_all.mak | 2 | ||||
| -rw-r--r-- | src/testdir/runtest.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test49.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_vimscript.vim (renamed from src/testdir/test_viml.vim) | 0 | ||||
| -rw-r--r-- | src/version.c | 2 |
10 files changed, 18 insertions, 16 deletions
diff --git a/src/Makefile b/src/Makefile index 6de64c03e..bcfb8cd13 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2213,7 +2213,7 @@ test_arglist \ test_usercommands \ test_utf8 \ test_viminfo \ - test_viml \ + test_vimscript \ test_visual \ test_window_cmd \ test_window_id \ diff --git a/src/eval.c b/src/eval.c index 725e540b9..4fc9f743e 100644 --- a/src/eval.c +++ b/src/eval.c @@ -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. */ diff --git a/src/ex_getln.c b/src/ex_getln.c index c498e00a1..3c40ff79a 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -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( diff --git a/src/if_py_both.h b/src/if_py_both.h index 4cd373402..78c70e700 100644 --- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -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); diff --git a/src/if_xcmdsrv.c b/src/if_xcmdsrv.c index d597154c9..6ef23353e 100644 --- a/src/if_xcmdsrv.c +++ b/src/if_xcmdsrv.c @@ -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; diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak index b0441f739..7e18b11dd 100644 --- a/src/testdir/Make_all.mak +++ b/src/testdir/Make_all.mak @@ -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 \ diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index 33490b61b..0c0a19790 100644 --- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -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 diff --git a/src/testdir/test49.vim b/src/testdir/test49.vim index e763c6f67..f50062e7b 100644 --- a/src/testdir/test49.vim +++ b/src/testdir/test49.vim @@ -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 "------------------------------------------------------------------------------- diff --git a/src/testdir/test_viml.vim b/src/testdir/test_vimscript.vim index c4dd03644..c4dd03644 100644 --- a/src/testdir/test_viml.vim +++ b/src/testdir/test_vimscript.vim diff --git a/src/version.c b/src/version.c index 3bd620485..a282a5f85 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 360, +/**/ 359, /**/ 358, |