diff options
| author | h-east <h.east.727@gmail.com> | 2021-10-04 21:51:57 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-10-04 21:51:57 +0100 |
| commit | 965d2edbce1a8ccba96925be5ac4575981f68949 (patch) | |
| tree | 5d3b1884ac6b125fdc692b1bf296b967fa6731cd | |
| parent | 6e649224926bbc1df6a4fdfa7a96b4acb1f8bee0 (diff) | |
patch 8.2.3474: some places use "Vimscript" instead of "Vim script"v8.2.3474
Problem: Some places use "Vimscript" instead of "Vim script".
Solution: Consistently use "Vim script". (Hirohito Higashi, closes #8910)
| -rw-r--r-- | runtime/doc/if_lua.txt | 8 | ||||
| -rw-r--r-- | src/getchar.c | 2 | ||||
| -rw-r--r-- | src/if_lua.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/runtime/doc/if_lua.txt b/runtime/doc/if_lua.txt index 799ef7347a..00b51a8f69 100644 --- a/runtime/doc/if_lua.txt +++ b/runtime/doc/if_lua.txt @@ -227,14 +227,14 @@ Vim evaluation and command execution, and others. *lua-vim-variables* The Vim editor global dictionaries |g:| |w:| |b:| |t:| |v:| can be accessed from Lua conveniently and idiomatically by referencing the `vim.*` Lua tables -described below. In this way you can easily read and modify global Vimscript +described below. In this way you can easily read and modify global Vim script variables from Lua. Example: > - vim.g.foo = 5 -- Set the g:foo Vimscript variable. - print(vim.g.foo) -- Get and print the g:foo Vimscript variable. - vim.g.foo = nil -- Delete (:unlet) the Vimscript variable. + vim.g.foo = 5 -- Set the g:foo Vim script variable. + print(vim.g.foo) -- Get and print the g:foo Vim script variable. + vim.g.foo = nil -- Delete (:unlet) the Vim script variable. vim.g *vim.g* Global (|g:|) editor variables. diff --git a/src/getchar.c b/src/getchar.c index 2d31c03e8b..93e3b879ed 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -2182,7 +2182,7 @@ f_getcharmod(typval_T *argvars UNUSED, typval_T *rettv) /* * Process messages that have been queued for netbeans or clientserver. * Also check if any jobs have ended. - * These functions can call arbitrary vimscript and should only be called when + * These functions can call arbitrary Vim script and should only be called when * it is safe to do so. */ void diff --git a/src/if_lua.c b/src/if_lua.c index a13103703d..34eee8e0c2 100644 --- a/src/if_lua.c +++ b/src/if_lua.c @@ -1853,7 +1853,7 @@ luaV_setvar(lua_State *L) // Update the key typval_T tv; - // Convert the lua value to a vimscript type in the temporary variable + // Convert the lua value to a Vim script type in the temporary variable lua_pushvalue(L, 4); if (luaV_totypval(L, -1, &tv) == FAIL) return luaL_error(L, "Couldn't convert lua value"); diff --git a/src/version.c b/src/version.c index 21aab4fbb5..e92719172f 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3474, +/**/ 3473, /**/ 3472, |