diff options
-rw-r--r-- | src/testdir/popupbounce.vim | 2 | ||||
-rw-r--r-- | src/testdir/runtest.vim | 4 | ||||
-rw-r--r-- | src/testdir/screendump.vim | 2 | ||||
-rw-r--r-- | src/testdir/test49.vim | 2 | ||||
-rw-r--r-- | src/testdir/test_autocmd.vim | 2 | ||||
-rw-r--r-- | src/testdir/test_cindent.vim | 4 | ||||
-rw-r--r-- | src/testdir/test_const.vim | 2 | ||||
-rw-r--r-- | src/testdir/test_popupwin.vim | 2 | ||||
-rw-r--r-- | src/testdir/test_quickfix.vim | 2 | ||||
-rw-r--r-- | src/testdir/test_search.vim | 2 | ||||
-rw-r--r-- | src/testdir/test_tabpage.vim | 2 | ||||
-rw-r--r-- | src/testdir/test_tcl.vim | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
13 files changed, 16 insertions, 14 deletions
diff --git a/src/testdir/popupbounce.vim b/src/testdir/popupbounce.vim index 2d1345bfd..b9f7bd179 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 db6dcd709..5623dc819 100644 --- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -349,7 +349,7 @@ let s:flaky_tests = [ \ '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 @@ for s:test in sort(s:tests) " 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 cc1c239da..d04d96d98 100644 --- a/src/testdir/screendump.vim +++ b/src/testdir/screendump.vim @@ -24,7 +24,7 @@ func VerifyScreenDump(buf, filename, options, ...) 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 7393ec415..bd6051461 100644 --- a/src/testdir/test49.vim +++ b/src/testdir/test49.vim @@ -521,7 +521,7 @@ endfunction " " 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 9dc578e45..0979bb4a1 100644 --- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -1091,7 +1091,7 @@ func Test_OptionSet() 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 e12e45787..2cb3f24b7 100644 --- a/src/testdir/test_cindent.vim +++ b/src/testdir/test_cindent.vim @@ -815,7 +815,7 @@ func Test_cindent_1() } } - public: // <-- this was incoreectly indented before!! + public: // <-- this was incorectly indented before!! void testfall(); protected: void testfall(); @@ -1780,7 +1780,7 @@ func Test_cindent_1() } } - 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 d93de72bd..55e4492bd 100644 --- a/src/testdir/test_const.vim +++ b/src/testdir/test_const.vim @@ -125,7 +125,7 @@ func Test_define_script_var_with_lock() 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 123d12aa7..16e451929 100644 --- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -1857,7 +1857,7 @@ func Test_popupwin_garbage_collect() 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 5aad58776..7a1f96d74 100644 --- a/src/testdir/test_quickfix.vim +++ b/src/testdir/test_quickfix.vim @@ -1667,7 +1667,7 @@ func Test_switchbuf() 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 7c30a1ac0..dbe4c2a4d 100644 --- a/src/testdir/test_search.vim +++ b/src/testdir/test_search.vim @@ -267,7 +267,7 @@ func Test_search_cmdline2() " 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 e22206767..c8ac1141f 100644 --- a/src/testdir/test_tabpage.vim +++ b/src/testdir/test_tabpage.vim @@ -58,7 +58,7 @@ function Test_tabpage() 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 9923a2e33..c2fd191b8 100644 --- a/src/testdir/test_tcl.vim +++ b/src/testdir/test_tcl.vim @@ -4,7 +4,7 @@ source check.vim 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 257c3aa25..afde7b6bc 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1955, +/**/ 1954, /**/ 1953, |