diff --git a/runtime/autoload/dist/vim.vim b/runtime/autoload/dist/vim.vim index bb858c5732..1632aed2b6 100644 --- a/runtime/autoload/dist/vim.vim +++ b/runtime/autoload/dist/vim.vim @@ -1,9 +1,9 @@ " Vim runtime support library, -" runs the vim9 script version or legacy script version +" runs the Vim9 script version or legacy script version " on demand (mostly for Neovim compatability) " " Maintainer: The Vim Project -" Last Change: 2023 Nov 04 +" Last Change: 2025 Apr 27 " enable the zip and gzip plugin by default, if not set diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt index 018dbcaf1a..fa9506da2e 100644 --- a/runtime/doc/filetype.txt +++ b/runtime/doc/filetype.txt @@ -1,4 +1,4 @@ -*filetype.txt* For Vim version 9.1. Last change: 2025 Apr 22 +*filetype.txt* For Vim version 9.1. Last change: 2025 Apr 27 VIM REFERENCE MANUAL by Bram Moolenaar @@ -269,7 +269,7 @@ D. If your filetype can only be detected by inspecting the contents of the item of the 'runtimepath' option. Example for Unix: > :!mkdir ~/.vim < - 2. Create a vim script file for doing this. Example: > + 2. Create a Vim script file for doing this. Example: > if did_filetype() " filetype already set.. finish " ..don't do these checks endif diff --git a/runtime/doc/if_perl.txt b/runtime/doc/if_perl.txt index 86edd05a0a..85e5a90e56 100644 --- a/runtime/doc/if_perl.txt +++ b/runtime/doc/if_perl.txt @@ -1,4 +1,4 @@ -*if_perl.txt* For Vim version 9.1. Last change: 2023 May 14 +*if_perl.txt* For Vim version 9.1. Last change: 2025 Apr 27 VIM REFERENCE MANUAL by Sven Verdoolaege @@ -74,7 +74,7 @@ The ActiveState one should work, Strawberry Perl is a good alternative. |script-here|. -Example vim script: > +Example Vim script: > function! WhitePearl() perl << EOF diff --git a/runtime/doc/pi_getscript.txt b/runtime/doc/pi_getscript.txt index 20caab1e15..e549ea6415 100644 --- a/runtime/doc/pi_getscript.txt +++ b/runtime/doc/pi_getscript.txt @@ -1,4 +1,4 @@ -*pi_getscript.txt* For Vim version 9.1. Last change: 2025 Mar 15 +*pi_getscript.txt* For Vim version 9.1. Last change: 2025 Apr 27 > GETSCRIPT REFERENCE MANUAL by Charles E. Campbell < @@ -156,7 +156,7 @@ may have. As an example, consider: > " GetLatestVimScripts: 884 1 :AutoInstall: AutoAlign.vim -This comment line tells getscript.vim to check vimscript #884 and that the +This comment line tells getscript.vim to check Vim script #884 and that the script is automatically installable. Getscript will also use this line to help build the GetLatestVimScripts.dat file, by including a line such as: > diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt index 51688b705f..00799911ed 100644 --- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -460,7 +460,7 @@ file using root-relative paths, use the full path: ============================================================================== 4. Network-Oriented File Transfer *netrw-xfer* {{{1 -Network-oriented file transfer under Vim is implemented by a vim script +Network-oriented file transfer under Vim is implemented by a Vim script () using plugin techniques. It currently supports both reading and writing across networks using rcp, scp, ftp or ftp+<.netrc>, scp, fetch, dav/cadaver, rsync, or sftp. diff --git a/runtime/doc/tags b/runtime/doc/tags index a094e14837..2e6c8e08b9 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -11383,6 +11383,7 @@ vim-modes-intro intro.txt /*vim-modes-intro* vim-raku ft_raku.txt /*vim-raku* vim-script-intro usr_41.txt /*vim-script-intro* vim-script-library eval.txt /*vim-script-library* +vim-script-notation usr_41.txt /*vim-script-notation* vim-security intro.txt /*vim-security* vim-shebang various.txt /*vim-shebang* vim-tutor-create pi_tutor.txt /*vim-tutor-create* diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt index a22b6f7980..ffa6fcb7ae 100644 --- a/runtime/doc/usr_41.txt +++ b/runtime/doc/usr_41.txt @@ -1,4 +1,4 @@ -*usr_41.txt* For Vim version 9.1. Last change: 2025 Apr 24 +*usr_41.txt* For Vim version 9.1. Last change: 2025 Apr 27 VIM USER MANUAL - by Bram Moolenaar @@ -35,8 +35,10 @@ like for example .vim files or configuration files like .vimrc and .gvimrc. These scripts may define functions, commands and settings that Vim uses to customize and extend its behavior. -With a slight abuse of nomenclature, we will use "Vim script" to refer to the -Vim scripting language throughout this documentation. This shorthand helps to + *vim-script-notation* +The correct notation is "Vim script" (or "Vim9 script" when refering to the +new Vim9 language |Vim9-script|), so we will use "Vim script" to refer to the +Vim scripting language throughout this documentation. This shorthand helps to streamline explanations and discussions about scripting with Vim. A Vim plugin is a collection of one or more Vim scripts, along with additional diff --git a/runtime/doc/vim9.txt b/runtime/doc/vim9.txt index ba72358d13..0dae57debc 100644 --- a/runtime/doc/vim9.txt +++ b/runtime/doc/vim9.txt @@ -1,4 +1,4 @@ -*vim9.txt* For Vim version 9.1. Last change: 2025 Apr 18 +*vim9.txt* For Vim version 9.1. Last change: 2025 Apr 27 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2043,7 +2043,7 @@ The script name after `import` can be: If the name does not end in ".vim" then the use of "as name" is required. -Once a vim9 script file has been imported, the result is cached and used the +Once a Vim9 script file has been imported, the result is cached and used the next time the same script is imported. It will not be read again. It is not allowed to import the same script twice, also when using two @@ -2056,7 +2056,7 @@ line, there can be no line break: > echo that .name # Error! < *import-map* -When you've imported a function from one script into a vim9 script you can +When you've imported a function from one script into a Vim9 script you can refer to the imported function in a mapping by prefixing it with ||: > noremap ,a :call name.Function() diff --git a/runtime/pack/dist/opt/editorconfig/plugin/editorconfig.vim b/runtime/pack/dist/opt/editorconfig/plugin/editorconfig.vim index 6eaa053e43..914e7788ff 100644 --- a/runtime/pack/dist/opt/editorconfig/plugin/editorconfig.vim +++ b/runtime/pack/dist/opt/editorconfig/plugin/editorconfig.vim @@ -325,7 +325,7 @@ call s:EditorConfigEnable(1) " UseConfigFiles function for different modes {{{1 function! s:UseConfigFiles_VimCore(bufnr, target) -" Use the vimscript EditorConfig core +" Use the Vim script EditorConfig core try let l:config = editorconfig_core#handler#get_configurations( \ { 'target': a:target } ) diff --git a/runtime/pack/dist/opt/netrw/autoload/netrw.vim b/runtime/pack/dist/opt/netrw/autoload/netrw.vim index f284117047..228f470639 100644 --- a/runtime/pack/dist/opt/netrw/autoload/netrw.vim +++ b/runtime/pack/dist/opt/netrw/autoload/netrw.vim @@ -2540,7 +2540,7 @@ fun! netrw#NetWrite(...) range endfun " --------------------------------------------------------------------- -" netrw#NetSource: source a remotely hosted vim script {{{2 +" netrw#NetSource: source a remotely hosted Vim script {{{2 " uses NetRead to get a copy of the file into a temporarily file, " then sources that file, " then removes that file. diff --git a/runtime/pack/dist/opt/netrw/doc/netrw.txt b/runtime/pack/dist/opt/netrw/doc/netrw.txt index 7c686ef4b8..5655acffa3 100644 --- a/runtime/pack/dist/opt/netrw/doc/netrw.txt +++ b/runtime/pack/dist/opt/netrw/doc/netrw.txt @@ -460,7 +460,7 @@ file using root-relative paths, use the full path: ============================================================================== 4. Network-Oriented File Transfer *netrw-xfer* {{{1 -Network-oriented file transfer under Vim is implemented by a vim script +Network-oriented file transfer under Vim is implemented by a Vim script () using plugin techniques. It currently supports both reading and writing across networks using rcp, scp, ftp or ftp+<.netrc>, scp, fetch, dav/cadaver, rsync, or sftp. diff --git a/runtime/syntax/generator/vim.vim.base b/runtime/syntax/generator/vim.vim.base index 1ddc9d2a24..7b91ff23ef 100644 --- a/runtime/syntax/generator/vim.vim.base +++ b/runtime/syntax/generator/vim.vim.base @@ -1486,7 +1486,7 @@ syn match vim9SearchDelim '^\s*\zs:[/?]\|[/?]$' contained contains=vimCmdSep syn region vimGlobal matchgroup=Statement start='\ = [line('.'), line('.')]): void enddef diff --git a/runtime/syntax/testdir/input/vim_ex_function.vim b/runtime/syntax/testdir/input/vim_ex_function.vim index c09019e087..95cf4586e1 100644 --- a/runtime/syntax/testdir/input/vim_ex_function.vim +++ b/runtime/syntax/testdir/input/vim_ex_function.vim @@ -177,7 +177,7 @@ function Foo(...) endfunction -" Issue #16243 (vimscript def parameters syntax highlight is wrong) +" Issue #16243 (Vim script def parameters syntax highlight is wrong) function Test(lines = [line('.'), line('.')]) endfunction diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim index 2ee17a29ab..741ec81349 100644 --- a/runtime/syntax/vim.vim +++ b/runtime/syntax/vim.vim @@ -1546,7 +1546,7 @@ syn match vim9SearchDelim '^\s*\zs:[/?]\|[/?]$' contained contains=vimCmdSep syn region vimGlobal matchgroup=Statement start='\ll_valtype, rettv, where) == FAIL) return NULL; diff --git a/src/gui_w32.c b/src/gui_w32.c index 4e6eca8971..400169a59c 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -9077,7 +9077,7 @@ test_gui_w32_sendevent_mouse(dict_T *args) if (dict_get_bool(args, "cell", FALSE)) { // calculate the middle of the character cell - // Note: Cell coordinates are 1-based from vimscript + // Note: Cell coordinates are 1-based from Vim script int pY = (row - 1) * gui.char_height + gui.char_height / 2; int pX = (col - 1) * gui.char_width + gui.char_width / 2; gui_mouse_moved(pX, pY); diff --git a/src/message_test.c b/src/message_test.c index 83767ece93..884a7a9ceb 100644 --- a/src/message_test.c +++ b/src/message_test.c @@ -34,7 +34,7 @@ // - warning: format ‘%S’ expects argument of type ‘wchar_t *’, but argument 4 has type ‘char *’ // - warning: unknown conversion type character ‘b’ in format // -// These formats are in practise only used from vim script printf() +// These formats are in practise only used from Vim script printf() // function and never as literals in C code. char *fmt_012p = "%012p"; char *fmt_5S = "%5S"; @@ -158,12 +158,12 @@ test_trunc_string_mbyte(void) /* * Test vim_snprintf() with a focus on checking that truncation is * correct when buffer is small, since it cannot be tested from - * vim script tests. Check that: + * Vim script tests. Check that: * - no buffer overflows happens (with valgrind or asan) * - output string is always NUL terminated. * * Not all formats of vim_snprintf() are checked here. They are - * checked more exhaustively in Test_printf*() vim script tests. + * checked more exhaustively in Test_printf*() Vim script tests. */ static void test_vim_snprintf(void) @@ -290,7 +290,7 @@ test_vim_snprintf(void) assert(bsize == 0 || STRNCMP(buf, "\x01\x02", bsize_int) == 0); assert(bsize == 0 || buf[MIN(n, bsize_int)] == '\0'); - // %p format is not tested in vim script tests Test_printf*() + // %p format is not tested in Vim script tests Test_printf*() // as it only makes sense in C code. // NOTE: SunOS libc doesn't use the prefix "0x" on %p. #ifdef SUN_SYSTEM diff --git a/src/profiler.c b/src/profiler.c index 504d713647..00da9b6480 100644 --- a/src/profiler.c +++ b/src/profiler.c @@ -8,7 +8,7 @@ */ /* - * profiler.c: vim script profiler + * profiler.c: Vim script profiler */ #include "vim.h" diff --git a/src/structs.h b/src/structs.h index 45e1b189eb..898f620efe 100644 --- a/src/structs.h +++ b/src/structs.h @@ -1976,7 +1976,7 @@ struct ufunc_S #define FC_DEAD 0x80 // function kept only for reference to dfunc #define FC_EXPORT 0x100 // "export def Func()" #define FC_NOARGS 0x200 // no a: variables in lambda -#define FC_VIM9 0x400 // defined in vim9 script file +#define FC_VIM9 0x400 // defined in Vim9 script file #define FC_CFUNC 0x800 // defined as Lua C func #define FC_COPY 0x1000 // copy of another function by // copy_lambda_to_global_func() diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim index c4b7b5743e..9b2fee35c1 100644 --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -4267,7 +4267,7 @@ func Test_ex_command_completion() " required for :* set cpo+=* let list = filter(getcompletion('', 'command'), 'exists(":" . v:val) == 0') - " :++ and :-- are only valid in Vim9 Script context, so they can be ignored + " :++ and :-- are only valid in Vim9 script context, so they can be ignored call assert_equal(['++', '--'], sort(list)) call assert_equal(2, exists(':k')) call assert_equal(0, exists(':ke')) diff --git a/src/testdir/test_source.vim b/src/testdir/test_source.vim index 3692eee5fa..55b2ffff20 100644 --- a/src/testdir/test_source.vim +++ b/src/testdir/test_source.vim @@ -57,7 +57,7 @@ func Test_different_script() call assert_fails('source XtwoScript', 'E121:') endfunc -" When sourcing a vim script, shebang should be ignored. +" When sourcing a Vim script, shebang should be ignored. func Test_source_ignore_shebang() call writefile(['#!./xyzabc', 'let g:val=369'], 'Xsisfile.vim', 'D') source Xsisfile.vim @@ -408,7 +408,7 @@ func Test_source_buffer_vim9() source call assert_equal(10, Xtestfunc()) - " test for sourcing a vim9 script with line continuation + " test for sourcing a Vim9 script with line continuation %d _ let lines =<< trim END vim9script diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim index 5407662cc2..d38e1c8968 100644 --- a/src/testdir/test_vim9_cmd.vim +++ b/src/testdir/test_vim9_cmd.vim @@ -159,7 +159,7 @@ def Test_cmdmod_execute() v9.CheckScriptSuccess(lines) delfunc g:TheFunc - # vim9cmd execute(cmd) executes code in vim9 script context + # vim9cmd execute(cmd) executes code in Vim9 script context lines =<< trim END vim9cmd execute("g:vim9executetest = 'bar'") call assert_equal('bar', g:vim9executetest) @@ -176,7 +176,7 @@ def Test_cmdmod_execute() unlet g:vim9executetest1 unlet g:vim9executetest2 - # legacy call execute(cmd) executes code in vim script context + # legacy call execute(cmd) executes code in Vim script context lines =<< trim END vim9script legacy call execute("let g:vim9executetest = 'bar'") diff --git a/src/testdir/vim9.vim b/src/testdir/vim9.vim index 64922b7d18..b994855b8c 100644 --- a/src/testdir/vim9.vim +++ b/src/testdir/vim9.vim @@ -1,6 +1,6 @@ vim9script -# Utility functions for testing vim9 script +# Utility functions for testing Vim9 script # Use a different file name for each run. var sequence = 1 diff --git a/src/testing.c b/src/testing.c index b316b64c92..cfa01ff9e7 100644 --- a/src/testing.c +++ b/src/testing.c @@ -1411,7 +1411,7 @@ test_gui_mouse_event(dict_T *args) if (dict_get_bool(args, "cell", FALSE)) { // calculate the middle of the character cell - // Note: Cell coordinates are 1-based from vimscript + // Note: Cell coordinates are 1-based from Vim script pY = (row - 1) * gui.char_height + gui.char_height / 2; pX = (col - 1) * gui.char_width + gui.char_width / 2; }