patch 8.1.1955: tests contain typos
Problem: Tests contain typos.
Solution: Correct the typos. (Dominique Pelle)
diff --git a/src/testdir/popupbounce.vim b/src/testdir/popupbounce.vim
index 2d1345b..b9f7bd1 100644
--- a/src/testdir/popupbounce.vim
+++ b/src/testdir/popupbounce.vim
@@ -6,7 +6,7 @@
" ./vim --clean -S testdir/popupbounce.vim main.c
" gprof vim gmon.out | vim -
-" using line contination
+" using line continuation
set nocp
" don't switch screens when quitting, so we can read the frames/sec
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index db6dcd7..5623dc8 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -349,7 +349,7 @@
\ 'Test_terminal_scrollback()',
\ 'Test_terminal_split_quit()',
\ 'Test_terminal_termwinkey()',
- \ 'Test_terminal_termwinsize_mininmum()',
+ \ 'Test_terminal_termwinsize_minimum()',
\ 'Test_terminal_termwinsize_option_fixed()',
\ 'Test_terminal_termwinsize_option_zero()',
\ 'Test_terminal_tmap()',
@@ -395,7 +395,7 @@
" Repeat a flaky test. Give up when:
" - it fails again with the same message
- " - it fails five times (with a different mesage)
+ " - it fails five times (with a different message)
if len(v:errors) > 0
\ && (index(s:flaky_tests, s:test) >= 0
\ || v:errors[0] =~ s:flaky_errors_re)
diff --git a/src/testdir/screendump.vim b/src/testdir/screendump.vim
index cc1c239..d04d96d 100644
--- a/src/testdir/screendump.vim
+++ b/src/testdir/screendump.vim
@@ -24,7 +24,7 @@
let reference = 'dumps/' . a:filename . '.dump'
let testfile = 'failed/' . a:filename . '.dump'
- " Redraw to execut the code that updates the screen. Otherwise we get the
+ " Redraw to execute the code that updates the screen. Otherwise we get the
" text and attributes only from the internal buffer.
redraw
diff --git a/src/testdir/test49.vim b/src/testdir/test49.vim
index 7393ec4..bd60514 100644
--- a/src/testdir/test49.vim
+++ b/src/testdir/test49.vim
@@ -521,7 +521,7 @@
"
" Create a script that consists of the body of the function a:funcname.
" Replace any ":return" by a ":finish", any argument variable by a global
-" variable, and and every ":call" by a ":source" for the next following argument
+" variable, and every ":call" by a ":source" for the next following argument
" in the variable argument list. This function is useful if similar tests are
" to be made for a ":return" from a function call or a ":finish" in a script
" file.
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index 9dc578e..0979bb4 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -1091,7 +1091,7 @@
call assert_equal(g:opt[0], g:opt[1])
- " 33: Test autocomands when an option value is converted internally.
+ " 33: Test autocommands when an option value is converted internally.
noa set backspace=1 " Reset global and local value (without triggering autocmd)
let g:options=[['backspace', 'indent,eol', 'indent,eol', 'indent,eol', '2', 'global', 'set']]
set backspace=2
diff --git a/src/testdir/test_cindent.vim b/src/testdir/test_cindent.vim
index e12e457..2cb3f24 100644
--- a/src/testdir/test_cindent.vim
+++ b/src/testdir/test_cindent.vim
@@ -815,7 +815,7 @@
}
}
- public: // <-- this was incoreectly indented before!!
+ public: // <-- this was incorectly indented before!!
void testfall();
protected:
void testfall();
@@ -1780,7 +1780,7 @@
}
}
- public: // <-- this was incoreectly indented before!!
+ public: // <-- this was incorectly indented before!!
void testfall();
protected:
void testfall();
diff --git a/src/testdir/test_const.vim b/src/testdir/test_const.vim
index d93de72..55e4492 100644
--- a/src/testdir/test_const.vim
+++ b/src/testdir/test_const.vim
@@ -125,7 +125,7 @@
unlet s:x
endfunc
-func Test_descructuring_with_lock()
+func Test_destructuring_with_lock()
const [a, b, c] = [1, 1.1, 'vim']
call assert_fails('let a = 1', 'E741:')
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 123d12a..16e4519 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -1857,7 +1857,7 @@
let winid = popup_create('something', #{filter: function('MyPopupFilter', [{}])})
call test_garbagecollect_now()
redraw
- " Must not crach caused by invalid memory access
+ " Must not crash caused by invalid memory access
call feedkeys('j', 'xt')
call assert_true(v:true)
diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim
index 5aad587..7a1f96d 100644
--- a/src/testdir/test_quickfix.vim
+++ b/src/testdir/test_quickfix.vim
@@ -1667,7 +1667,7 @@
call assert_equal(1, bufwinnr('Xqftestfile3'))
" If only quickfix window is open in the current tabpage, jumping to an
- " entry with 'switchubf' set to 'usetab' should search in other tabpages.
+ " entry with 'switchbuf' set to 'usetab' should search in other tabpages.
enew | only
set switchbuf=usetab
tabedit Xqftestfile1
diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim
index 7c30a1a..dbe4c2a 100644
--- a/src/testdir/test_search.vim
+++ b/src/testdir/test_search.vim
@@ -267,7 +267,7 @@
" nor "/foo\<c-u>\<cr>" works to delete the commandline.
" In that case Vim should return "E35 no previous regular expression",
" but it looks like Vim still sees /foo and therefore the test fails.
- " Therefore, disableing this test
+ " Therefore, disabling this test
"call assert_fails(feedkeys("/foo\<c-w>\<cr>", 'tx'), 'E35')
"call assert_equal({'lnum': 1, 'leftcol': 0, 'col': 0, 'topfill': 0, 'topline': 1, 'coladd': 0, 'skipcol': 0, 'curswant': 0}, winsaveview())
diff --git a/src/testdir/test_tabpage.vim b/src/testdir/test_tabpage.vim
index e222067..c8ac114 100644
--- a/src/testdir/test_tabpage.vim
+++ b/src/testdir/test_tabpage.vim
@@ -58,7 +58,7 @@
q
"
"
- " Test for ":tab drop multi-opend-file" to keep current tabpage and window.
+ " Test for ":tab drop multi-opened-file" to keep current tabpage and window.
new test1
tabnew
new test1
diff --git a/src/testdir/test_tcl.vim b/src/testdir/test_tcl.vim
index 9923a2e..c2fd191 100644
--- a/src/testdir/test_tcl.vim
+++ b/src/testdir/test_tcl.vim
@@ -4,7 +4,7 @@
CheckFeature tcl
" Helper function as there is no builtin tcleval() function similar
-" to perleval, luaevel(), pyeval(), etc.
+" to perleval, luaeval(), pyeval(), etc.
func TclEval(tcl_expr)
let s = split(execute('tcl ' . a:tcl_expr), "\n")
return (len(s) == 0) ? '' : s[-1]
diff --git a/src/version.c b/src/version.c
index 257c3aa..afde7b6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1955,
+/**/
1954,
/**/
1953,