# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1633381205 -7200
# Node ID 2ee0425960fe1329cdee2aab955958d9e1dd3a45
# Parent  9c221ad9634ae928573a03bfe9756c66689542e8
patch 8.2.3474: some places use "Vimscript" instead of "Vim script"

Commit: https://github.com/vim/vim/commit/965d2edbce1a8ccba96925be5ac4575981f68949
Author: h-east <h.east.727@gmail.com>
Date:   Mon Oct 4 21:51:57 2021 +0100

    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 https://github.com/vim/vim/issues/8910)

diff --git a/runtime/doc/if_lua.txt b/runtime/doc/if_lua.txt
--- a/runtime/doc/if_lua.txt
+++ b/runtime/doc/if_lua.txt
@@ -227,14 +227,14 @@ Vim evaluation and command execution, an
                                                         *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
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -2182,7 +2182,7 @@ f_getcharmod(typval_T *argvars UNUSED, t
 /*
  * 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
--- 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
--- 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,