To: vim_dev@googlegroups.com Subject: Patch 8.2.1432 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1432 Problem: Various inconsistencies in test files. Solution: Add modelines where they were missing. Use Check commands instead of silently skipping over tests. Adjust indents and comments. (Ken Takata, closes #6695) Files: src/testdir/test_arglist.vim, src/testdir/test_assert.vim, src/testdir/test_autochdir.vim, src/testdir/test_autocmd.vim, src/testdir/test_autoload.vim, src/testdir/test_balloon.vim, src/testdir/test_balloon_gui.vim, src/testdir/test_behave.vim, src/testdir/test_blockedit.vim, src/testdir/test_breakindent.vim, src/testdir/test_bufline.vim, src/testdir/test_bufwintabinfo.vim, src/testdir/test_cd.vim, src/testdir/test_changedtick.vim, src/testdir/test_changelist.vim, src/testdir/test_channel.vim, src/testdir/test_checkpath.vim, src/testdir/test_cindent.vim, src/testdir/test_cjk_linebreak.vim, src/testdir/test_clientserver.vim, src/testdir/test_close_count.vim, src/testdir/test_cmdline.vim, src/testdir/test_command_count.vim, src/testdir/test_comparators.vim, src/testdir/test_compiler.vim, src/testdir/test_crypt.vim, src/testdir/test_cursorline.vim, src/testdir/test_curswant.vim, src/testdir/test_debugger.vim, src/testdir/test_delete.vim, src/testdir/test_diffmode.vim, src/testdir/test_digraph.vim, src/testdir/test_display.vim, src/testdir/test_edit.vim, src/testdir/test_environ.vim, src/testdir/test_erasebackword.vim, src/testdir/test_escaped_glob.vim, src/testdir/test_ex_equal.vim, src/testdir/test_ex_undo.vim, src/testdir/test_ex_z.vim, src/testdir/test_exec_while_if.vim, src/testdir/test_exists.vim, src/testdir/test_exists_autocmd.vim, src/testdir/test_exit.vim, src/testdir/test_expand_dllpath.vim, src/testdir/test_expr_utf8.vim, src/testdir/test_feedkeys.vim, src/testdir/test_file_size.vim, src/testdir/test_fileformat.vim, src/testdir/test_filter_cmd.vim, src/testdir/test_find_complete.vim, src/testdir/test_findfile.vim, src/testdir/test_fixeol.vim, src/testdir/test_flatten.vim, src/testdir/test_fnameescape.vim, src/testdir/test_fold.vim, src/testdir/test_functions.vim, src/testdir/test_ga.vim, src/testdir/test_getcwd.vim, src/testdir/test_getvar.vim, src/testdir/test_glob2regpat.vim, src/testdir/test_global.vim, src/testdir/test_gui.vim, src/testdir/test_gui_init.vim, src/testdir/test_highlight.vim, src/testdir/test_hlsearch.vim, src/testdir/test_iminsert.vim, src/testdir/test_increment_dbcs.vim, src/testdir/test_ins_complete.vim, src/testdir/test_interrupt.vim, src/testdir/test_job_fails.vim, src/testdir/test_join.vim, src/testdir/test_json.vim, src/testdir/test_jumplist.vim, src/testdir/test_jumps.vim, src/testdir/test_lambda.vim, src/testdir/test_langmap.vim, src/testdir/test_largefile.vim, src/testdir/test_lineending.vim, src/testdir/test_listchars.vim, src/testdir/test_listener.vim, src/testdir/test_listlbr.vim, src/testdir/test_listlbr_utf8.vim, src/testdir/test_makeencoding.vim, src/testdir/test_man.vim, src/testdir/test_mapping.vim, src/testdir/test_marks.vim, src/testdir/test_matchadd_conceal.vim, src/testdir/test_matchadd_conceal_utf8.vim, src/testdir/test_memory_usage.vim, src/testdir/test_menu.vim, src/testdir/test_messages.vim, src/testdir/test_mksession.vim, src/testdir/test_modeline.vim, src/testdir/test_nested_function.vim, src/testdir/test_number.vim, src/testdir/test_options.vim, src/testdir/test_packadd.vim, src/testdir/test_partial.vim, src/testdir/test_paste.vim, src/testdir/test_plus_arg_edit.vim, src/testdir/test_preview.vim, src/testdir/test_profile.vim, src/testdir/test_prompt_buffer.vim, src/testdir/test_quickfix.vim, src/testdir/test_quotestar.vim, src/testdir/test_random.vim, src/testdir/test_recover.vim, src/testdir/test_regex_char_classes.vim, src/testdir/test_regexp_latin.vim, src/testdir/test_registers.vim, src/testdir/test_rename.vim, src/testdir/test_retab.vim, src/testdir/test_scriptnames.vim, src/testdir/test_scroll_opt.vim, src/testdir/test_scrollbind.vim, src/testdir/test_search_stat.vim, src/testdir/test_searchpos.vim, src/testdir/test_set.vim, src/testdir/test_sha256.vim, src/testdir/test_shift.vim, src/testdir/test_shortpathname.vim, src/testdir/test_signs.vim, src/testdir/test_sort.vim, src/testdir/test_sound.vim, src/testdir/test_source_utf8.vim, src/testdir/test_spellfile.vim, src/testdir/test_startup.vim, src/testdir/test_startup_utf8.vim, src/testdir/test_stat.vim, src/testdir/test_suspend.vim, src/testdir/test_swap.vim, src/testdir/test_syntax.vim, src/testdir/test_tab.vim, src/testdir/test_tabline.vim, src/testdir/test_tagcase.vim, src/testdir/test_tagjump.vim, src/testdir/test_taglist.vim, src/testdir/test_termcodes.vim, src/testdir/test_termencoding.vim, src/testdir/test_terminal.vim, src/testdir/test_terminal2.vim, src/testdir/test_terminal3.vim, src/testdir/test_terminal_fail.vim, src/testdir/test_true_false.vim, src/testdir/test_utf8_comparisons.vim, src/testdir/test_vartabs.vim, src/testdir/test_version.vim, src/testdir/test_vim9_expr.vim, src/testdir/test_winbar.vim, src/testdir/test_winbuf_close.vim, src/testdir/test_window_cmd.vim, src/testdir/test_window_id.vim, src/testdir/test_windows_home.vim, src/testdir/test_wnext.vim, src/testdir/test_wordcount.vim, src/testdir/test_writefile.vim, src/testdir/test_xxd.vim *** ../vim-8.2.1431/src/testdir/test_arglist.vim 2020-06-26 22:46:23.233370940 +0200 --- src/testdir/test_arglist.vim 2020-08-12 18:43:41.345608766 +0200 *************** *** 242,252 **** func Test_args_with_quote() " Only on Unix can a file name include a double quote. ! if has('unix') ! args \"foobar ! call assert_equal('"foobar', argv(0)) ! %argdelete ! endif endfunc " Test for 0argadd and 0argedit --- 242,252 ---- func Test_args_with_quote() " Only on Unix can a file name include a double quote. ! CheckUnix ! ! args \"foobar ! call assert_equal('"foobar', argv(0)) ! %argdelete endfunc " Test for 0argadd and 0argedit *** ../vim-8.2.1431/src/testdir/test_assert.vim 2020-07-12 23:09:15.450213545 +0200 --- src/testdir/test_assert.vim 2020-08-12 18:43:41.345608766 +0200 *************** *** 374,376 **** --- 374,378 ---- " Verify that if a test function ends Vim the test script detects this. quit endfunc + + " vim: shiftwidth=2 sts=2 expandtab *** ../vim-8.2.1431/src/testdir/test_autochdir.vim 2019-11-09 17:54:32.000000000 +0100 --- src/testdir/test_autochdir.vim 2020-08-12 18:43:41.345608766 +0200 *************** *** 24,26 **** --- 24,28 ---- call chdir(cwd) call delete('samples/Xtest') endfunc + + " vim: shiftwidth=2 sts=2 expandtab *** ../vim-8.2.1431/src/testdir/test_autocmd.vim 2020-08-05 12:02:36.604150364 +0200 --- src/testdir/test_autocmd.vim 2020-08-12 18:43:41.345608766 +0200 *************** *** 70,78 **** endfunc func Test_cursorhold_insert_with_timer_interrupt() ! if !has('job') ! return ! endif " Need to move the cursor. call feedkeys("ggG", "xt") --- 70,76 ---- endfunc func Test_cursorhold_insert_with_timer_interrupt() ! CheckFeature job " Need to move the cursor. call feedkeys("ggG", "xt") *************** *** 535,543 **** endfunc func Test_OptionSet() ! if !has("eval") || !exists("+autochdir") ! return ! endif badd test_autocmd.vim --- 533,539 ---- endfunc func Test_OptionSet() ! CheckOption autochdir badd test_autocmd.vim *************** *** 1778,1789 **** endfunc func Test_nocatch_wipe_dummy_buffer() ! if has('quickfix') ! " Nasty autocommand: wipe buffer on any event. ! au * x bwipe ! call assert_fails('lv½ /x', 'E937') ! au! ! endif endfunc function s:Before_test_dirchanged() --- 1774,1784 ---- endfunc func Test_nocatch_wipe_dummy_buffer() ! CheckFeature quickfix ! " Nasty autocommand: wipe buffer on any event. ! au * x bwipe ! call assert_fails('lv½ /x', 'E937') ! au! endfunc function s:Before_test_dirchanged() *************** *** 1834,1842 **** endfunc function Test_dirchanged_auto() ! if !exists('+autochdir') ! return ! endif call s:Before_test_dirchanged() call test_autochdir() autocmd test_dirchanged DirChanged auto call add(s:li, "auto:") --- 1829,1835 ---- endfunc function Test_dirchanged_auto() ! CheckOption autochdir call s:Before_test_dirchanged() call test_autochdir() autocmd test_dirchanged DirChanged auto call add(s:li, "auto:") *************** *** 2087,2095 **** " - FileReadPost decompress the file func Test_ReadWrite_Autocmds() " Run this test only on Unix-like systems and if gzip is available ! if !has('unix') || !executable("gzip") ! return ! endif " Make $GZIP empty, "-v" would cause trouble. let $GZIP = "" --- 2080,2087 ---- " - FileReadPost decompress the file func Test_ReadWrite_Autocmds() " Run this test only on Unix-like systems and if gzip is available ! CheckUnix ! CheckExecutable gzip " Make $GZIP empty, "-v" would cause trouble. let $GZIP = "" *** ../vim-8.2.1431/src/testdir/test_autoload.vim 2020-07-29 22:10:42.037708767 +0200 --- src/testdir/test_autoload.vim 2020-08-12 18:43:41.345608766 +0200 *************** *** 22,24 **** --- 22,26 ---- call assert_equal('some', auto9#getsome()) call assert_equal(49, auto9#add42(7)) endfunc + + " vim: shiftwidth=2 sts=2 expandtab *** ../vim-8.2.1431/src/testdir/test_balloon.vim 2020-04-08 21:50:18.872619665 +0200 --- src/testdir/test_balloon.vim 2020-08-12 18:43:41.345608766 +0200 *************** *** 64,66 **** --- 64,68 ---- call StopVimInTerminal(buf) call delete('XTest_beval_visual') endfunc + + " vim: shiftwidth=2 sts=2 expandtab *** ../vim-8.2.1431/src/testdir/test_balloon_gui.vim 2019-08-18 22:42:47.000000000 +0200 --- src/testdir/test_balloon_gui.vim 2020-08-12 18:43:41.345608766 +0200 *************** *** 17,19 **** --- 17,21 ---- sleep 10m call balloon_show('') endfunc + + " vim: shiftwidth=2 sts=2 expandtab *** ../vim-8.2.1431/src/testdir/test_behave.vim 2018-09-14 20:07:48.000000000 +0200 --- src/testdir/test_behave.vim 2020-08-12 18:43:41.345608766 +0200 *************** *** 27,29 **** --- 27,31 ---- func Test_behave_error() call assert_fails('behave x', 'E475:') endfunc + + " vim: shiftwidth=2 sts=2 expandtab *** ../vim-8.2.1431/src/testdir/test_blockedit.vim 2019-12-06 20:39:15.000000000 +0100 --- src/testdir/test_blockedit.vim 2020-08-12 18:43:41.345608766 +0200 *************** *** 1,5 **** " Test for block inserting - " func Test_blockinsert_indent() new --- 1,4 ---- *** ../vim-8.2.1431/src/testdir/test_breakindent.vim 2020-05-16 14:07:34.816736239 +0200 --- src/testdir/test_breakindent.vim 2020-08-12 18:43:41.345608766 +0200 *************** *** 46,54 **** func Test_breakindent01_vartabs() " like 01 but with vartabs feature ! if !has("vartabs") ! return ! endif call s:test_windows('setl briopt=min:0 vts=4') let lines = s:screen_lines(line('.'),8) let expect = [ --- 46,52 ---- func Test_breakindent01_vartabs() " like 01 but with vartabs feature ! CheckFeature vartabs call s:test_windows('setl briopt=min:0 vts=4') let lines = s:screen_lines(line('.'),8) let expect = [ *************** *** 75,83 **** endfunc func Test_breakindent02_vartabs() ! if !has("vartabs") ! return ! endif " simple breakindent test with showbreak set call s:test_windows('setl briopt=min:0 sbr=>> vts=4') let lines = s:screen_lines(line('.'),8) --- 73,79 ---- endfunc func Test_breakindent02_vartabs() ! CheckFeature vartabs " simple breakindent test with showbreak set call s:test_windows('setl briopt=min:0 sbr=>> vts=4') let lines = s:screen_lines(line('.'),8) *************** *** 106,114 **** func Test_breakindent03_vartabs() " simple breakindent test with showbreak set and briopt including sbr ! if !has("vartabs") ! return ! endif call s:test_windows('setl briopt=sbr,min:0 sbr=++ vts=4') let lines = s:screen_lines(line('.'),8) let expect = [ --- 102,108 ---- func Test_breakindent03_vartabs() " simple breakindent test with showbreak set and briopt including sbr ! CheckFeature vartabs call s:test_windows('setl briopt=sbr,min:0 sbr=++ vts=4') let lines = s:screen_lines(line('.'),8) let expect = [ *************** *** 139,147 **** func Test_breakindent04_vartabs() " breakindent set with min width 18 ! if !has("vartabs") ! return ! endif call s:test_windows('setl sbr= briopt=min:18 vts=4') let lines = s:screen_lines(line('.'),8) let expect = [ --- 133,139 ---- func Test_breakindent04_vartabs() " breakindent set with min width 18 ! CheckFeature vartabs call s:test_windows('setl sbr= briopt=min:18 vts=4') let lines = s:screen_lines(line('.'),8) let expect = [ *************** *** 169,177 **** func Test_breakindent05_vartabs() " breakindent set and shift by 2 ! if !has("vartabs") ! return ! endif call s:test_windows('setl briopt=shift:2,min:0 vts=4') let lines = s:screen_lines(line('.'),8) let expect = [ --- 161,167 ---- func Test_breakindent05_vartabs() " breakindent set and shift by 2 ! CheckFeature vartabs call s:test_windows('setl briopt=shift:2,min:0 vts=4') let lines = s:screen_lines(line('.'),8) let expect = [ *************** *** 198,206 **** func Test_breakindent06_vartabs() " breakindent set and shift by -1 ! if !has("vartabs") ! return ! endif call s:test_windows('setl briopt=shift:-1,min:0 vts=4') let lines = s:screen_lines(line('.'),8) let expect = [ --- 188,194 ---- func Test_breakindent06_vartabs() " breakindent set and shift by -1 ! CheckFeature vartabs call s:test_windows('setl briopt=shift:-1,min:0 vts=4') let lines = s:screen_lines(line('.'),8) let expect = [ *************** *** 227,235 **** endfunc func Test_breakindent07_vartabs() ! if !has("vartabs") ! return ! endif " breakindent set and shift by 1, Number set sbr=? and briopt:sbr call s:test_windows('setl briopt=shift:1,sbr,min:0 nu sbr=? nuw=4 cpo+=n vts=4') let lines = s:screen_lines(line('.'),10) --- 215,221 ---- endfunc func Test_breakindent07_vartabs() ! CheckFeature vartabs " breakindent set and shift by 1, Number set sbr=? and briopt:sbr call s:test_windows('setl briopt=shift:1,sbr,min:0 nu sbr=? nuw=4 cpo+=n vts=4') let lines = s:screen_lines(line('.'),10) *************** *** 258,266 **** endfunc func Test_breakindent07a_vartabs() ! if !has("vartabs") ! return ! endif " breakindent set and shift by 1, Number set sbr=? and briopt:sbr call s:test_windows('setl briopt=shift:1,sbr,min:0 nu sbr=? nuw=4 vts=4') let lines = s:screen_lines(line('.'),10) --- 244,250 ---- endfunc func Test_breakindent07a_vartabs() ! CheckFeature vartabs " breakindent set and shift by 1, Number set sbr=? and briopt:sbr call s:test_windows('setl briopt=shift:1,sbr,min:0 nu sbr=? nuw=4 vts=4') let lines = s:screen_lines(line('.'),10) *************** *** 293,301 **** endfunc func Test_breakindent08_vartabs() ! if !has("vartabs") ! return ! endif " breakindent set and shift by 1, Number and list set sbr=# and briopt:sbr call s:test_windows('setl briopt=shift:1,sbr,min:0 nu nuw=4 sbr=# list cpo+=n ts=4 vts=4') " make sure, cache is invalidated! --- 277,283 ---- endfunc func Test_breakindent08_vartabs() ! CheckFeature vartabs " breakindent set and shift by 1, Number and list set sbr=# and briopt:sbr call s:test_windows('setl briopt=shift:1,sbr,min:0 nu nuw=4 sbr=# list cpo+=n ts=4 vts=4') " make sure, cache is invalidated! *************** *** 327,335 **** endfunc func Test_breakindent08a_vartabs() ! if !has("vartabs") ! return ! endif " breakindent set and shift by 1, Number and list set sbr=# and briopt:sbr call s:test_windows('setl briopt=shift:1,sbr,min:0 nu nuw=4 sbr=# list vts=4') let lines = s:screen_lines(line('.'),10) --- 309,315 ---- endfunc func Test_breakindent08a_vartabs() ! CheckFeature vartabs " breakindent set and shift by 1, Number and list set sbr=# and briopt:sbr call s:test_windows('setl briopt=shift:1,sbr,min:0 nu nuw=4 sbr=# list vts=4') let lines = s:screen_lines(line('.'),10) *************** *** 356,364 **** endfunc func Test_breakindent09_vartabs() ! if !has("vartabs") ! return ! endif " breakindent set and shift by 1, Number and list set sbr=# call s:test_windows('setl briopt=shift:1,min:0 nu nuw=4 sbr=# list vts=4') let lines = s:screen_lines(line('.'),10) --- 336,342 ---- endfunc func Test_breakindent09_vartabs() ! CheckFeature vartabs " breakindent set and shift by 1, Number and list set sbr=# call s:test_windows('setl briopt=shift:1,min:0 nu nuw=4 sbr=# list vts=4') let lines = s:screen_lines(line('.'),10) *************** *** 390,398 **** endfunc func Test_breakindent10_vartabs() ! if !has("vartabs") ! return ! endif " breakindent set, Number set sbr=~ call s:test_windows('setl cpo+=n sbr=~ nu nuw=4 nolist briopt=sbr,min:0 vts=4') " make sure, cache is invalidated! --- 368,374 ---- endfunc func Test_breakindent10_vartabs() ! CheckFeature vartabs " breakindent set, Number set sbr=~ call s:test_windows('setl cpo+=n sbr=~ nu nuw=4 nolist briopt=sbr,min:0 vts=4') " make sure, cache is invalidated! *************** *** 421,429 **** endfunc func Test_breakindent11_vartabs() ! if !has("vartabs") ! return ! endif " test strdisplaywidth() call s:test_windows('setl cpo-=n sbr=>> nu nuw=4 nolist briopt= ts=4 vts=4') let text = getline(2) --- 397,403 ---- endfunc func Test_breakindent11_vartabs() ! CheckFeature vartabs " test strdisplaywidth() call s:test_windows('setl cpo-=n sbr=>> nu nuw=4 nolist briopt= ts=4 vts=4') let text = getline(2) *************** *** 447,455 **** endfunc func Test_breakindent12_vartabs() ! if !has("vartabs") ! return ! endif " test breakindent with long indent let s:input = "\t\t\t\t\t{" call s:test_windows('setl breakindent linebreak briopt=min:10 nu numberwidth=3 ts=4 list listchars=tab:>- vts=4') --- 421,427 ---- endfunc func Test_breakindent12_vartabs() ! CheckFeature vartabs " test breakindent with long indent let s:input = "\t\t\t\t\t{" call s:test_windows('setl breakindent linebreak briopt=min:10 nu numberwidth=3 ts=4 list listchars=tab:>- vts=4') *************** *** 478,486 **** endfunc func Test_breakindent13_vartabs() ! if !has("vartabs") ! return ! endif let s:input = "" call s:test_windows('setl breakindent briopt=min:10 ts=8 vts=8') vert resize 20 --- 450,456 ---- endfunc func Test_breakindent13_vartabs() ! CheckFeature vartabs let s:input = "" call s:test_windows('setl breakindent briopt=min:10 ts=8 vts=8') vert resize 20 *************** *** 512,520 **** endfunc func Test_breakindent14_vartabs() ! if !has("vartabs") ! return ! endif let s:input = "" call s:test_windows('setl breakindent briopt= ts=8 vts=8') vert resize 30 --- 482,488 ---- endfunc func Test_breakindent14_vartabs() ! CheckFeature vartabs let s:input = "" call s:test_windows('setl breakindent briopt= ts=8 vts=8') vert resize 30 *************** *** 548,556 **** endfunc func Test_breakindent15_vartabs() ! if !has("vartabs") ! return ! endif let s:input = "" call s:test_windows('setl breakindent briopt= ts=8 sw=8 vts=8') vert resize 30 --- 516,522 ---- endfunc func Test_breakindent15_vartabs() ! CheckFeature vartabs let s:input = "" call s:test_windows('setl breakindent briopt= ts=8 sw=8 vts=8') vert resize 30 *************** *** 592,600 **** endfunc func Test_breakindent16_vartabs() ! if !has("vartabs") ! return ! endif " Check that overlong lines are indented correctly. let s:input = "" call s:test_windows('setl breakindent briopt=min:0 ts=4 vts=4') --- 558,564 ---- endfunc func Test_breakindent16_vartabs() ! CheckFeature vartabs " Check that overlong lines are indented correctly. let s:input = "" call s:test_windows('setl breakindent briopt=min:0 ts=4 vts=4') *************** *** 620,628 **** endfunc func Test_breakindent17_vartabs() ! if !has("vartabs") ! return ! endif let s:input = "" call s:test_windows('setl breakindent list listchars=tab:<-> showbreak=+++') call setline(1, "\t" . repeat('a', 63)) --- 584,590 ---- endfunc func Test_breakindent17_vartabs() ! CheckFeature vartabs let s:input = "" call s:test_windows('setl breakindent list listchars=tab:<-> showbreak=+++') call setline(1, "\t" . repeat('a', 63)) *************** *** 640,648 **** endfunc func Test_breakindent18_vartabs() ! if !has("vartabs") ! return ! endif let s:input = "" call s:test_windows('setl breakindent list listchars=tab:<->') call setline(1, "\t" . repeat('a', 63)) --- 602,608 ---- endfunc func Test_breakindent18_vartabs() ! CheckFeature vartabs let s:input = "" call s:test_windows('setl breakindent list listchars=tab:<->') call setline(1, "\t" . repeat('a', 63)) *** ../vim-8.2.1431/src/testdir/test_bufline.vim 2020-04-26 15:59:51.202952140 +0200 --- src/testdir/test_bufline.vim 2020-08-12 18:43:41.345608766 +0200 *************** *** 202,204 **** --- 202,206 ---- call StopVimInTerminal(buf) call delete('XscriptMatchCommon') endfunc + + " vim: shiftwidth=2 sts=2 expandtab *** ../vim-8.2.1431/src/testdir/test_bufwintabinfo.vim 2020-07-18 22:24:18.630245010 +0200 --- src/testdir/test_bufwintabinfo.vim 2020-08-12 18:43:41.345608766 +0200 *************** *** 1,4 **** --- 1,5 ---- " Tests for the getbufinfo(), getwininfo() and gettabinfo() functions + source check.vim func Test_getbufwintabinfo() *************** *** 168,170 **** --- 169,173 ---- edit Xfoo bw! endfunc + + " vim: shiftwidth=2 sts=2 expandtab *** ../vim-8.2.1431/src/testdir/test_cd.vim 2020-08-09 21:45:48.716655399 +0200 --- src/testdir/test_cd.vim 2020-08-12 18:43:41.345608766 +0200 *************** *** 191,193 **** --- 191,195 ---- call delete('XComplDir2', 'd') call delete('XComplFile') endfunc + + " vim: shiftwidth=2 sts=2 expandtab *** ../vim-8.2.1431/src/testdir/test_changedtick.vim 2019-06-08 20:43:52.000000000 +0200 --- src/testdir/test_changedtick.vim 2020-08-12 18:43:41.345608766 +0200 *************** *** 93,95 **** --- 93,97 ---- bwipe call delete(fname) endfunc + + " vim: shiftwidth=2 sts=2 expandtab *** ../vim-8.2.1431/src/testdir/test_changelist.vim 2020-03-10 07:48:06.571619551 +0100 --- src/testdir/test_changelist.vim 2020-08-12 18:43:41.345608766 +0200 *************** *** 1,10 **** " Tests for the changelist functionality " Tests for the getchangelist() function func Test_getchangelist() ! if !has("jumplist") ! return ! endif bwipe! enew --- 1,10 ---- " Tests for the changelist functionality + source check.vim + " Tests for the getchangelist() function func Test_getchangelist() ! CheckFeature jumplist bwipe! enew *** ../vim-8.2.1431/src/testdir/test_channel.vim 2020-07-11 22:14:54.310422225 +0200 --- src/testdir/test_channel.vim 2020-08-12 18:43:41.345608766 +0200 *************** *** 1348,1356 **** " This caused a crash, because messages were handled while peeking for a " character. func Test_exit_cb_wipes_buf() ! if !has('timers') ! return ! endif set cursorline lazyredraw call test_override('redraw_flag', 1) new --- 1348,1354 ---- " This caused a crash, because messages were handled while peeking for a " character. func Test_exit_cb_wipes_buf() ! CheckFeature timers set cursorline lazyredraw call test_override('redraw_flag', 1) new *** ../vim-8.2.1431/src/testdir/test_checkpath.vim 2019-05-06 21:56:13.000000000 +0200 --- src/testdir/test_checkpath.vim 2020-08-12 18:43:41.345608766 +0200 *************** *** 102,104 **** --- 102,106 ---- set include& set includeexpr& endfunc + + " vim: shiftwidth=2 sts=2 expandtab *** ../vim-8.2.1431/src/testdir/test_cindent.vim 2020-05-31 17:49:21.776435849 +0200 --- src/testdir/test_cindent.vim 2020-08-12 18:43:41.349608745 +0200 *************** *** 1,5 **** " Test for cinoptions and cindent - " func Test_cino_hash() " Test that curbuf->b_ind_hash_comment is correctly reset --- 1,4 ---- *** ../vim-8.2.1431/src/testdir/test_cjk_linebreak.vim 2020-06-06 15:23:22.836373760 +0200 --- src/testdir/test_cjk_linebreak.vim 2020-08-12 18:43:41.349608745 +0200 *************** *** 1,3 **** --- 1,5 ---- + " Test for CJK linebreak + scriptencoding utf-8 func Run_cjk_linebreak_after(rigorous) *************** *** 95,97 **** --- 97,101 ---- %d_ endfor endfunc + + " vim: shiftwidth=2 sts=2 expandtab *** ../vim-8.2.1431/src/testdir/test_clientserver.vim 2020-07-12 20:49:25.488102795 +0200 --- src/testdir/test_clientserver.vim 2020-08-12 18:43:41.349608745 +0200 *************** *** 30,36 **** func Test_client_server() let cmd = GetVimCommand() if cmd == '' ! return endif call Check_X11_Connection() --- 30,36 ---- func Test_client_server() let cmd = GetVimCommand() if cmd == '' ! throw 'GetVimCommand() failed' endif call Check_X11_Connection() *** ../vim-8.2.1431/src/testdir/test_close_count.vim 2017-11-16 21:41:26.000000000 +0100 --- src/testdir/test_close_count.vim 2020-08-12 18:43:41.349608745 +0200 *************** *** 1,5 **** - " Tests for :[count]close! command func Test_close_count() enew! | only --- 1,5 ---- " Tests for :[count]close! command + func Test_close_count() enew! | only *************** *** 172,174 **** --- 172,176 ---- set nohidden only! endfunc + + " vim: shiftwidth=2 sts=2 expandtab *** ../vim-8.2.1431/src/testdir/test_cmdline.vim 2020-07-11 22:14:54.310422225 +0200 --- src/testdir/test_cmdline.vim 2020-08-12 18:43:41.349608745 +0200 *************** *** 86,94 **** endfunc func Test_map_completion() ! if !has('cmdline_compl') ! return ! endif call feedkeys(":map \\"\", 'xt') call assert_equal('"map ', getreg(':')) call feedkeys(":map