patch 8.2.3474: some places use "Vimscript" instead of "Vim script"

Problem:    Some places use "Vimscript" instead of "Vim script".
Solution:   Consistently use "Vim script". (Hirohito Higashi, closes #8910)

diff --git a/runtime/doc/if_lua.txt b/runtime/doc/if_lua.txt
index 799ef7347a1265376016b5179abd7d54b05d86db..00b51a8f690f52ea71da18e06d2e153990010a8f 100644 (file)
--- 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 2d31c03e8bf46f0dfe45e8f371b5aa88d45eefae..93e3b879ed7b19a9ae518bf6ad8b48809b990c3b 100644 (file)
--- 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 a13103703d52a7c0ac90811d349a131e35d54e75..34eee8e0c2164bdc57e3181e718c76157e93dd38 100644 (file)
--- 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 21aab4fbb596488ddb1830e66f3e743e3505e657..e92719172f7b86964da5a40176aab72352ef805f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -757,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3474,
 /**/
     3473,
 /**/