diff options
author | Bram Moolenaar <Bram@vim.org> | 2017-02-23 19:03:28 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2017-02-23 19:03:28 +0100 |
commit | b544f3c81f1e6a50322855681ac266ffaa8e313c (patch) | |
tree | 65ae4057660ce5f73ad2b3e68fe4645570702b4d | |
parent | dc9a081712ec8c140e6d4909e9f6b03a629d32d3 (diff) |
patch 8.0.0360: sometimes VimL is used instead of "Vim script"v8.0.0360
Problem: Sometimes VimL is used, which is confusing.
Solution: Consistently use "Vim script". (Hirohito Higashi)
-rw-r--r-- | runtime/doc/if_mzsch.txt | 2 | ||||
-rw-r--r-- | runtime/doc/if_pyth.txt | 12 | ||||
-rw-r--r-- | runtime/doc/syntax.txt | 4 | ||||
-rw-r--r-- | runtime/doc/usr_02.txt | 8 | ||||
-rw-r--r-- | runtime/doc/version7.txt | 2 | ||||
-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 |
15 files changed, 32 insertions, 30 deletions
diff --git a/runtime/doc/if_mzsch.txt b/runtime/doc/if_mzsch.txt index 9ef6c3d386..7e206f5190 100644 --- a/runtime/doc/if_mzsch.txt +++ b/runtime/doc/if_mzsch.txt @@ -249,7 +249,7 @@ Windows *mzscheme-window* 5. mzeval() Vim function *mzscheme-mzeval* To facilitate bi-directional interface, you can use |mzeval()| function to -evaluate MzScheme expressions and pass their values to VimL. +evaluate MzScheme expressions and pass their values to Vim script. ============================================================================== 6. Using Function references *mzscheme-funcref* diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt index 71bbb13f89..4f9ecbdbed 100644 --- a/runtime/doc/if_pyth.txt +++ b/runtime/doc/if_pyth.txt @@ -676,11 +676,11 @@ vim.Function object *python-Function* dictionary. Note that explicit `self` keyword used when calling resulting object overrides this attribute. auto_rebind Boolean. True if partial created from this Python object - and stored in the VimL dictionary should be automatically - rebound to the dictionary it is stored in when this - dictionary is indexed. Exposes Vim internal difference - between `dict.func` (auto_rebind=True) and - `function(dict.func,dict)` (auto_rebind=False). This + and stored in the Vim script dictionary should be + automatically rebound to the dictionary it is stored in + when this dictionary is indexed. Exposes Vim internal + difference between `dict.func` (auto_rebind=True) and + `function(dict.func,dict)` (auto_rebind=False). This attribute makes no sense if `self` attribute is `None`. Constructor additionally accepts `args`, `self` and `auto_rebind` @@ -711,7 +711,7 @@ vim.Function object *python-Function* 8. pyeval() and py3eval() Vim functions *python-pyeval* To facilitate bi-directional interface, you can use |pyeval()| and |py3eval()| -functions to evaluate Python expressions and pass their values to VimL. +functions to evaluate Python expressions and pass their values to Vim script. |pyxeval()| is also available. ============================================================================== diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index 7aaea9dc89..9ef8d61e37 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -3327,8 +3327,8 @@ Some folding is now supported with syntax/vim.vim: > g:vimsyn_folding =~ 't' : fold tcl script < *g:vimsyn_noerror* -Not all error highlighting that syntax/vim.vim does may be correct; VimL is a -difficult language to highlight correctly. A way to suppress error +Not all error highlighting that syntax/vim.vim does may be correct; Vim script +is a difficult language to highlight correctly. A way to suppress error highlighting is to put the following line in your |vimrc|: > let g:vimsyn_noerror = 1 diff --git a/runtime/doc/usr_02.txt b/runtime/doc/usr_02.txt index 48dede8e4f..3c689436f3 100644 --- a/runtime/doc/usr_02.txt +++ b/runtime/doc/usr_02.txt @@ -589,7 +589,7 @@ Summary: *help-summary* > register: > :help quote: -13) Vim Script (VimL) is available at > +13) Vim script is available at > :help eval.txt < Certain aspects of the language are available at :h expr-X where "X" is a single letter. E.g. > @@ -599,10 +599,10 @@ Summary: *help-summary* > Also important is > :help function-list < to find a short description of all functions available. Help topics for - VimL functions always include the "()", so: > + Vim script functions always include the "()", so: > :help append() -< talks about the append VimL function rather than how to append text in the - current buffer. +< talks about the append Vim script function rather than how to append text + in the current buffer. 14) Mappings are talked about in the help page :h |map.txt|. Use > :help mapmode-i diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt index 3f6e10adc2..98ea0a37bd 100644 --- a/runtime/doc/version7.txt +++ b/runtime/doc/version7.txt @@ -10202,7 +10202,7 @@ objects in place of `str()` ones avoiding possibility of UnicodeDecodeError. interfaces to some extent. Extent will be improved in the future. Added special |python-vars| objects also available for |python-buffer| and -|python-window|. They ease access to VimL variables from Python. +|python-window|. They ease access to Vim script variables from Python. Now you no longer need to alter `sys.path` to import your module: special hooks are responsible for importing from {rtp}/python2, {rtp}/python3 and diff --git a/src/Makefile b/src/Makefile index 6de64c03e3..bcfb8cd135 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 725e540b95..4fc9f743e8 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 c498e00a12..3c40ff79aa 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 4cd373402c..78c70e700b 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 d597154c98..6ef23353e4 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 b0441f7395..7e18b11dd3 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 33490b61bb..0c0a197902 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 e763c6f677..f50062e7b2 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 c4dd036447..c4dd036447 100644 --- a/src/testdir/test_viml.vim +++ b/src/testdir/test_vimscript.vim diff --git a/src/version.c b/src/version.c index 3bd620485e..a282a5f859 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, |