From a6d5e6b105a6b4d499e8b288f660afecf62356fd Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Mon, 14 Oct 2024 09:27:29 +0800 Subject: [PATCH] vim-patch:a420547: runtime(misc): Use consistent "Vim script" spelling (#30805) References: https://groups.google.com/g/vim_dev/c/3Z5yM8KER2w/m/wAqws0QSEAAJ closes: vim/vim#15863 https://github.com/vim/vim/commit/a4205471adae39c80fb7f151a4f33051fcb80001 Co-authored-by: h-east --- runtime/doc/editing.txt | 2 +- runtime/menu.vim | 2 +- runtime/syntax/modula2/opt/r10.vim | 2 +- test/old/testdir/script_util.vim | 2 +- test/old/testdir/test_expr.vim | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index 0008713025..91c9554d63 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -1287,7 +1287,7 @@ separated by ';'. For example, to have only Vim files in the dialog, you could use the following command: > - let g:browsefilter = "Vim Scripts\t*.vim\nVim Startup Files\t*vimrc\n" + let g:browsefilter = "Vim scripts\t*.vim\nVim Startup Files\t*vimrc\n" You can override the filter setting on a per-buffer basis by setting the b:browsefilter variable. You would most likely set b:browsefilter in a diff --git a/runtime/menu.vim b/runtime/menu.vim index 4576ca0ab7..662eea9403 100644 --- a/runtime/menu.vim +++ b/runtime/menu.vim @@ -1130,7 +1130,7 @@ else endif tmenu ToolBar.LoadSesn Choose a session to load tmenu ToolBar.SaveSesn Save current session - tmenu ToolBar.RunScript Choose a Vim Script to run + tmenu ToolBar.RunScript Choose a Vim script to run tmenu ToolBar.Make Make current project (:make) tmenu ToolBar.RunCtags Build tags in current directory tree (!ctags -R .) tmenu ToolBar.TagJump Jump to tag under cursor diff --git a/runtime/syntax/modula2/opt/r10.vim b/runtime/syntax/modula2/opt/r10.vim index 775f498dfb..5172be54c6 100644 --- a/runtime/syntax/modula2/opt/r10.vim +++ b/runtime/syntax/modula2/opt/r10.vim @@ -157,7 +157,7 @@ syn match modula2Base16Num "0[ux][0-9A-F]\+\('[0-9A-F]\+\)*" "| which greatly diminishes readability and thereby increases the opportunity "| for error during maintenance. Ideally, regular expressions should be split "| into small human readable pieces with interleaved comments that explain -"| precisely what each piece is doing. Vimscript imposes poor design. :-( +"| precisely what each piece is doing. Vim script imposes poor design. :-( syn match modula2Base10Num \ "\(\(0[bux]\@!\|[1-9]\)[0-9]*\('[0-9]\+\)*\)\(\.[0-9]\+\('[0-9]\+\)*\(e[+-]\?[0-9]\+\('[0-9]\+\)*\)\?\)\?" diff --git a/test/old/testdir/script_util.vim b/test/old/testdir/script_util.vim index 28d6a621d6..a300b670c7 100644 --- a/test/old/testdir/script_util.vim +++ b/test/old/testdir/script_util.vim @@ -1,4 +1,4 @@ -" Functions shared by the tests for Vim Script +" Functions shared by the tests for Vim script " Commands to track the execution path of a script com! XpathINIT let g:Xpath = '' diff --git a/test/old/testdir/test_expr.vim b/test/old/testdir/test_expr.vim index 8871e7e7d7..58a385cba8 100644 --- a/test/old/testdir/test_expr.vim +++ b/test/old/testdir/test_expr.vim @@ -883,7 +883,7 @@ func Test_string_interp() #" String conversion. call assert_equal('hello from ' .. v:version, $"hello from {v:version}") call assert_equal('hello from ' .. v:version, $'hello from {v:version}') - #" Paper over a small difference between VimScript behaviour. + #" Paper over a small difference between Vim script behaviour. call assert_equal(string(v:true), $"{v:true}") call assert_equal('(1+1=2)', $"(1+1={1 + 1})") #" Hex-escaped opening brace: char2nr('{') == 0x7b