Skip to content

Commit b544f3c

Browse files
committed
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)
1 parent dc9a081 commit b544f3c

File tree

15 files changed

+32
-30
lines changed

15 files changed

+32
-30
lines changed

runtime/doc/if_mzsch.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ Windows *mzscheme-window*
249249
5. mzeval() Vim function *mzscheme-mzeval*
250250

251251
To facilitate bi-directional interface, you can use |mzeval()| function to
252-
evaluate MzScheme expressions and pass their values to VimL.
252+
evaluate MzScheme expressions and pass their values to Vim script.
253253

254254
==============================================================================
255255
6. Using Function references *mzscheme-funcref*

runtime/doc/if_pyth.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -676,11 +676,11 @@ vim.Function object *python-Function*
676676
dictionary. Note that explicit `self` keyword used when
677677
calling resulting object overrides this attribute.
678678
auto_rebind Boolean. True if partial created from this Python object
679-
and stored in the VimL dictionary should be automatically
680-
rebound to the dictionary it is stored in when this
681-
dictionary is indexed. Exposes Vim internal difference
682-
between `dict.func` (auto_rebind=True) and
683-
`function(dict.func,dict)` (auto_rebind=False). This
679+
and stored in the Vim script dictionary should be
680+
automatically rebound to the dictionary it is stored in
681+
when this dictionary is indexed. Exposes Vim internal
682+
difference between `dict.func` (auto_rebind=True) and
683+
`function(dict.func,dict)` (auto_rebind=False). This
684684
attribute makes no sense if `self` attribute is `None`.
685685

686686
Constructor additionally accepts `args`, `self` and `auto_rebind`
@@ -711,7 +711,7 @@ vim.Function object *python-Function*
711711
8. pyeval() and py3eval() Vim functions *python-pyeval*
712712

713713
To facilitate bi-directional interface, you can use |pyeval()| and |py3eval()|
714-
functions to evaluate Python expressions and pass their values to VimL.
714+
functions to evaluate Python expressions and pass their values to Vim script.
715715
|pyxeval()| is also available.
716716

717717
==============================================================================

runtime/doc/syntax.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3327,8 +3327,8 @@ Some folding is now supported with syntax/vim.vim: >
33273327
g:vimsyn_folding =~ 't' : fold tcl script
33283328
<
33293329
*g:vimsyn_noerror*
3330-
Not all error highlighting that syntax/vim.vim does may be correct; VimL is a
3331-
difficult language to highlight correctly. A way to suppress error
3330+
Not all error highlighting that syntax/vim.vim does may be correct; Vim script
3331+
is a difficult language to highlight correctly. A way to suppress error
33323332
highlighting is to put the following line in your |vimrc|: >
33333333
33343334
let g:vimsyn_noerror = 1

runtime/doc/usr_02.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ Summary: *help-summary* >
589589
register: >
590590
:help quote:
591591
592-
13) Vim Script (VimL) is available at >
592+
13) Vim script is available at >
593593
:help eval.txt
594594
< Certain aspects of the language are available at :h expr-X where "X" is a
595595
single letter. E.g. >
@@ -599,10 +599,10 @@ Summary: *help-summary* >
599599
Also important is >
600600
:help function-list
601601
< to find a short description of all functions available. Help topics for
602-
VimL functions always include the "()", so: >
602+
Vim script functions always include the "()", so: >
603603
:help append()
604-
< talks about the append VimL function rather than how to append text in the
605-
current buffer.
604+
< talks about the append Vim script function rather than how to append text
605+
in the current buffer.
606606

607607
14) Mappings are talked about in the help page :h |map.txt|. Use >
608608
:help mapmode-i

runtime/doc/version7.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10202,7 +10202,7 @@ objects in place of `str()` ones avoiding possibility of UnicodeDecodeError.
1020210202
interfaces to some extent. Extent will be improved in the future.
1020310203

1020410204
Added special |python-vars| objects also available for |python-buffer| and
10205-
|python-window|. They ease access to VimL variables from Python.
10205+
|python-window|. They ease access to Vim script variables from Python.
1020610206

1020710207
Now you no longer need to alter `sys.path` to import your module: special
1020810208
hooks are responsible for importing from {rtp}/python2, {rtp}/python3 and

src/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2213,7 +2213,7 @@ test_arglist \
22132213
test_usercommands \
22142214
test_utf8 \
22152215
test_viminfo \
2216-
test_viml \
2216+
test_vimscript \
22172217
test_visual \
22182218
test_window_cmd \
22192219
test_window_id \

src/eval.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -950,7 +950,7 @@ eval_expr(char_u *arg, char_u **nextcmd)
950950

951951

952952
/*
953-
* Call some vimL function and return the result in "*rettv".
953+
* Call some Vim script function and return the result in "*rettv".
954954
* Uses argv[argc] for the function arguments. Only Number and String
955955
* arguments are currently supported.
956956
* Returns OK or FAIL.
@@ -1027,7 +1027,7 @@ call_vim_function(
10271027
}
10281028

10291029
/*
1030-
* Call vimL function "func" and return the result as a number.
1030+
* Call Vim script function "func" and return the result as a number.
10311031
* Returns -1 when calling the function fails.
10321032
* Uses argv[argc] for the function arguments.
10331033
*/
@@ -1055,7 +1055,7 @@ call_func_retnr(
10551055

10561056
# if (defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)) || defined(PROTO)
10571057
/*
1058-
* Call vimL function "func" and return the result as a string.
1058+
* Call Vim script function "func" and return the result as a string.
10591059
* Returns NULL when calling the function fails.
10601060
* Uses argv[argc] for the function arguments.
10611061
*/
@@ -1080,7 +1080,7 @@ call_func_retstr(
10801080
# endif
10811081

10821082
/*
1083-
* Call vimL function "func" and return the result as a List.
1083+
* Call Vim script function "func" and return the result as a List.
10841084
* Uses argv[argc] for the function arguments.
10851085
* Returns NULL when there is something wrong.
10861086
*/

src/ex_getln.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5140,8 +5140,8 @@ expand_shellcmd(
51405140
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);
51415141

51425142
/*
5143-
* Call "user_expand_func()" to invoke a user defined VimL function and return
5144-
* the result (either a string or a List).
5143+
* Call "user_expand_func()" to invoke a user defined Vim script function and
5144+
* return the result (either a string or a List).
51455145
*/
51465146
static void *
51475147
call_user_expand_func(

src/if_py_both.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -582,9 +582,9 @@ VimTryStart(void)
582582
VimTryEnd(void)
583583
{
584584
--trylevel;
585-
/* Without this it stops processing all subsequent VimL commands and
586-
* generates strange error messages if I e.g. try calling Test() in a
587-
* cycle */
585+
/* Without this it stops processing all subsequent Vim script commands and
586+
* generates strange error messages if I e.g. try calling Test() in a cycle
587+
*/
588588
did_emsg = FALSE;
589589
/* Keyboard interrupt should be preferred over anything else */
590590
if (got_int)
@@ -625,7 +625,7 @@ VimTryEnd(void)
625625
discard_current_exception();
626626
return -1;
627627
}
628-
/* Finally transform VimL exception to python one */
628+
/* Finally transform Vim script exception to python one */
629629
else
630630
{
631631
PyErr_SetVim((char *)current_exception->value);

src/if_xcmdsrv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,8 +1449,8 @@ server_parse_message(
14491449
char_u *enc;
14501450

14511451
/*
1452-
* This is a (n)otification. Sent with serverreply_send in VimL.
1453-
* Execute any autocommand and save it for later retrieval
1452+
* This is a (n)otification. Sent with serverreply_send in Vim
1453+
* script. Execute any autocommand and save it for later retrieval
14541454
*/
14551455
p += 2;
14561456
gotWindow = 0;

0 commit comments

Comments
 (0)