patch 9.0.1886: Various Typos
Problem: Various Typos
Solution: Fix Typos
This is a collection of typo related commits.
closes: #12753
closes: #13016
Co-authored-by: Adri Verhoef <a3@a3.xs4all.nl>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
Co-authored-by: Viktor Szépe <viktor@szepe.net>
Co-authored-by: nuid64 <lvkuzvesov@proton.me>
Co-authored-by: Meng Xiangzhuo <aumo@foxmail.com>
Co-authored-by: Dominique Pellé <dominique.pelle@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index b74dda9..1b9ecc9 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -2025,8 +2025,8 @@
" Test for BufUnload autocommand that unloads all the other buffers
func Test_bufunload_all()
let g:test_is_flaky = 1
- call writefile(['Test file Xxx1'], 'Xxx1', 'D')"
- call writefile(['Test file Xxx2'], 'Xxx2', 'D')"
+ call writefile(['Test file Xxx1'], 'Xxx1', 'D')
+ call writefile(['Test file Xxx2'], 'Xxx2', 'D')
let content =<< trim [CODE]
func UnloadAllBufs()
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 6be2137..5a35083 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -524,7 +524,7 @@
let start = reltime()
let handle = ch_open('localhost:9876', s:chopt)
if ch_status(handle) != "fail"
- " Oops, port does exists.
+ " Oops, port exists.
call ch_close(handle)
else
let elapsed = reltime(start)
@@ -538,7 +538,7 @@
try
let handle = ch_open('localhost:9867', {'waittime': 500})
if ch_status(handle) != "fail"
- " Oops, port does exists.
+ " Oops, port exists.
call ch_close(handle)
else
" Failed connection should wait about 500 msec. Can be longer if the
diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim
index 3ce5421..d662f4a 100644
--- a/src/testdir/test_edit.vim
+++ b/src/testdir/test_edit.vim
@@ -1219,7 +1219,7 @@
endfunc
func Test_edit_MOUSE()
- " This is a simple test, since we not really using the mouse here
+ " This is a simple test, since we're not really using the mouse here
CheckFeature mouse
10new
call setline(1, range(1, 100))
@@ -1797,7 +1797,7 @@
close!
set charconvert&
- " 'charconvert' function doesn't create a output file
+ " 'charconvert' function doesn't create an output file
func Cconv1()
endfunc
set charconvert=Cconv1()
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 654d912..b14c541 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -2911,7 +2911,7 @@
call term_sendkeys(buf, getstate)
call WaitForAssert({-> assert_match('state: mSc; mode: n', term_getline(buf, 6))}, 1000)
- " A operator is pending
+ " An operator is pending
call term_sendkeys(buf, ":call RunTimer()\<CR>y")
call TermWait(buf, 25)
call term_sendkeys(buf, "y")
diff --git a/src/testdir/test_highlight.vim b/src/testdir/test_highlight.vim
index 6e39d4e..af60503 100644
--- a/src/testdir/test_highlight.vim
+++ b/src/testdir/test_highlight.vim
@@ -878,7 +878,7 @@
hi clear
endfunc
-" Test for 'ctermul in a highlight group
+" Test for 'ctermul' in a highlight group
func Test_highlight_ctermul()
CheckNotGui
call assert_notmatch('ctermul=', HighlightArgs('Normal'))
diff --git a/src/testdir/test_listdict.vim b/src/testdir/test_listdict.vim
index 3ff2097..b7c8ad7 100644
--- a/src/testdir/test_listdict.vim
+++ b/src/testdir/test_listdict.vim
@@ -373,7 +373,7 @@
endtry
call assert_equal('Vim(let):E716: "1500"', str)
- " lookup each items
+ " lookup each item
for i in range(1500)
call assert_equal(3000 - i, d[i])
endfor
diff --git a/src/testdir/test_mksession.vim b/src/testdir/test_mksession.vim
index 5485e14..78d301f 100644
--- a/src/testdir/test_mksession.vim
+++ b/src/testdir/test_mksession.vim
@@ -568,7 +568,7 @@
func Test_mkview_terminal_windows()
CheckFeature terminal
- " create two window on the same terminal to check this is handled OK
+ " create two windows on the same terminal to check this is handled OK
terminal
let term_buf = bufnr()
exe 'sbuf ' .. term_buf
diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
index efda142..9111eb8 100644
--- a/src/testdir/test_normal.vim
+++ b/src/testdir/test_normal.vim
@@ -380,7 +380,7 @@
endfunc
func Test_normal07_internalfmt()
- " basic test for internal formmatter to textwidth of 12
+ " basic test for internal formatter to textwidth of 12
let list=range(1,11)
call map(list, 'v:val." "')
10new
@@ -2582,7 +2582,7 @@
exe "norm! G0\<c-v>4k4ly"
exe "norm! gvood"
call assert_equal(['', 'abfgh', 'abfgh', 'abfgh', 'fgh', 'fgh', 'fgh', 'fgh', 'fgh'], getline(1,'$'))
- " gv cannot be used in operator pending mode
+ " gv cannot be used in operator pending mode
call assert_beeps('normal! cgv')
" gv should beep without a previously selected visual area
new
diff --git a/src/testdir/test_substitute.vim b/src/testdir/test_substitute.vim
index 920473d..b99d0e0 100644
--- a/src/testdir/test_substitute.vim
+++ b/src/testdir/test_substitute.vim
@@ -1448,7 +1448,7 @@
let bufnr = bufnr('%')
put ="abcdef"
silent! s/\%')/\=R()
- call assert_fails(':%s/./\=R()/g', 'E565')
+ call assert_fails(':%s/./\=R()/g', 'E565:')
delfunc R
exe bufnr .. "bw!"
endfunc
diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim
index 9f1e91d..2549f32 100644
--- a/src/testdir/test_vim9_class.vim
+++ b/src/testdir/test_vim9_class.vim
@@ -1884,7 +1884,7 @@
enddef
endclass
END
- v9.CheckScriptFailure(lines, 'E1407: Member "IsEven": type mismatch, expected func(number): bool but got func(number): string')
+ v9.CheckScriptFailure(lines, 'E1407: Method "IsEven": type mismatch, expected func(number): bool but got func(number): string')
lines =<< trim END
vim9script
@@ -1897,7 +1897,7 @@
enddef
endclass
END
- v9.CheckScriptFailure(lines, 'E1407: Member "IsEven": type mismatch, expected func(number): bool but got func(bool): bool')
+ v9.CheckScriptFailure(lines, 'E1407: Method "IsEven": type mismatch, expected func(number): bool but got func(bool): bool')
lines =<< trim END
vim9script
@@ -1910,7 +1910,7 @@
enddef
endclass
END
- v9.CheckScriptFailure(lines, 'E1407: Member "IsEven": type mismatch, expected func(number): bool but got func(number, ...list<number>): bool')
+ v9.CheckScriptFailure(lines, 'E1407: Method "IsEven": type mismatch, expected func(number): bool but got func(number, ...list<number>): bool')
# access superclass interface members from subclass, mix variable order
lines =<< trim END
@@ -4576,7 +4576,7 @@
enddef
endclass
END
- v9.CheckScriptFailure(lines, 'E1407: Member "Foo": type mismatch, expected func(string, number): list<number> but got func(number, string): list<string>')
+ v9.CheckScriptFailure(lines, 'E1407: Method "Foo": type mismatch, expected func(string, number): list<number> but got func(number, string): list<string>')
# Use an abstract class to invoke an abstract method
# FIXME: This should fail
diff --git a/src/testdir/test_vimscript.vim b/src/testdir/test_vimscript.vim
index 002d115..0c4aedb 100644
--- a/src/testdir/test_vimscript.vim
+++ b/src/testdir/test_vimscript.vim
@@ -3105,7 +3105,7 @@
" should be given.
"
" This test reuses the function MESSAGES() from the previous test.
-" This functions checks the messages in g:msgfile.
+" This function checks the messages in g:msgfile.
"-------------------------------------------------------------------------------
func Test_nested_while_error()
@@ -3230,7 +3230,7 @@
" error messages should be given.
"
" This test reuses the function MESSAGES() from the previous test.
-" This functions checks the messages in g:msgfile.
+" This function checks the messages in g:msgfile.
"-------------------------------------------------------------------------------
func Test_nested_cont_break_error()
@@ -3336,7 +3336,7 @@
" should be given.
"
" This test reuses the function MESSAGES() from the previous test.
-" This functions checks the messages in g:msgfile.
+" This function check the messages in g:msgfile.
"-------------------------------------------------------------------------------
func Test_nested_endtry_error()
diff --git a/src/testdir/test_virtualedit.vim b/src/testdir/test_virtualedit.vim
index da5f6f5..44c5ec8 100644
--- a/src/testdir/test_virtualedit.vim
+++ b/src/testdir/test_virtualedit.vim
@@ -236,7 +236,7 @@
set virtualedit=
endfunc
-" Using "C" then then <CR> moves the last remaining character to the next
+" Using "C" then <CR> moves the last remaining character to the next
" line. (Mary Ellen Foster)
func Test_ve_del_to_eol()
new