To: vim_dev@googlegroups.com Subject: Patch 8.2.0432 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0432 Problem: A few tests fail in a huge terminal. Solution: Make the tests pass. (Dominique Pelle, closes #5829) Files: src/testdir/test_autocmd.vim, src/testdir/test_options.vim, src/testdir/test_termcodes.vim, src/testdir/test_terminal.vim, src/testdir/test_window_cmd.vim *** ../vim-8.2.0431/src/testdir/test_autocmd.vim 2020-03-19 13:55:00.526204898 +0100 --- src/testdir/test_autocmd.vim 2020-03-23 19:25:46.871657389 +0100 *************** *** 1967,1978 **** func Test_autocmd_bufreadpre() new let b:bufreadpre = 1 ! call append(0, range(100)) w! XAutocmdBufReadPre.txt autocmd BufReadPre :let b:bufreadpre += 1 ! norm! 50gg sp ! norm! 100gg wincmd p let g:wsv1 = winsaveview() wincmd p --- 1967,1978 ---- func Test_autocmd_bufreadpre() new let b:bufreadpre = 1 ! call append(0, range(1000)) w! XAutocmdBufReadPre.txt autocmd BufReadPre :let b:bufreadpre += 1 ! norm! 500gg sp ! norm! 1000gg wincmd p let g:wsv1 = winsaveview() wincmd p *** ../vim-8.2.0431/src/testdir/test_options.vim 2020-03-22 14:41:19.167442574 +0100 --- src/testdir/test_options.vim 2020-03-23 19:25:46.871657389 +0100 *************** *** 396,403 **** func Test_set_one_column() let out_mult = execute('set all')->split("\n") let out_one = execute('set! all')->split("\n") ! " one column should be two to four times as many lines ! call assert_inrange(len(out_mult) * 2, len(out_mult) * 4, len(out_one)) endfunc func Test_set_values() --- 396,402 ---- func Test_set_one_column() let out_mult = execute('set all')->split("\n") let out_one = execute('set! all')->split("\n") ! call assert_true(len(out_mult) < len(out_one)) endfunc func Test_set_values() *** ../vim-8.2.0431/src/testdir/test_termcodes.vim 2020-03-22 14:08:27.321399669 +0100 --- src/testdir/test_termcodes.vim 2020-03-23 19:25:46.871657389 +0100 *************** *** 758,773 **** let row = &lines for ttymouse_val in g:Ttymouse_values + g:Ttymouse_dec ! let msg = 'ttymouse=' .. ttymouse_val ! exe 'set ttymouse=' .. ttymouse_val ! call feedkeys(':"3456789' ! \ .. MouseLeftClickCode(row, 7) ! \ .. MouseLeftReleaseCode(row, 7) .. 'L' ! \ .. MouseRightClickCode(row, 4) ! \ .. MouseRightReleaseCode(row, 4) .. 'R' ! \ .. "\", 'Lx!') ! call assert_equal('"3R456L789', @:, msg) endfor let &mouse = save_mouse --- 758,777 ---- let row = &lines for ttymouse_val in g:Ttymouse_values + g:Ttymouse_dec ! " When 'ttymouse' is 'xterm2', row/col bigger than 223 are not supported. ! if ttymouse_val !=# 'xterm2' || row <= 223 ! let msg = 'ttymouse=' .. ttymouse_val ! exe 'set ttymouse=' .. ttymouse_val ! ! call feedkeys(':"3456789' ! \ .. MouseLeftClickCode(row, 7) ! \ .. MouseLeftReleaseCode(row, 7) .. 'L' ! \ .. MouseRightClickCode(row, 4) ! \ .. MouseRightReleaseCode(row, 4) .. 'R' ! \ .. "\", 'Lx!') ! call assert_equal('"3R456L789', @:, msg) ! endif endfor let &mouse = save_mouse *** ../vim-8.2.0431/src/testdir/test_terminal.vim 2020-03-22 14:41:19.167442574 +0100 --- src/testdir/test_terminal.vim 2020-03-23 19:25:46.871657389 +0100 *************** *** 673,679 **** let len = 5000 endif ! for c in ['a','b','c','d','e','f','g','h','i','j','k'] call term_sendkeys(buf, 'echo ' . repeat(c, len) . "\") endfor call term_sendkeys(buf, "echo done\") --- 673,679 ---- let len = 5000 endif ! for c in split('abcdefghijklmnopqrstuvwxyz', '\zs') call term_sendkeys(buf, 'echo ' . repeat(c, len) . "\") endfor call term_sendkeys(buf, "echo done\") *************** *** 2495,2501 **** func TermExit(...) call term_sendkeys(bufnr('#'), "exit\") call popup_close(win_getid()) ! endfu call OpenTerms() call term_sendkeys(g:buf0, "exit\") --- 2495,2501 ---- func TermExit(...) call term_sendkeys(bufnr('#'), "exit\") call popup_close(win_getid()) ! endfunc call OpenTerms() call term_sendkeys(g:buf0, "exit\") *************** *** 2503,2506 **** exe g:buf0 .. 'bwipe!' set hidden& endfunc - --- 2503,2505 ---- *** ../vim-8.2.0431/src/testdir/test_window_cmd.vim 2020-03-22 21:23:43.558965830 +0100 --- src/testdir/test_window_cmd.vim 2020-03-23 19:25:46.871657389 +0100 *************** *** 1013,1025 **** let dir = (a:dir_arg == 'v') ? 'vert ' : '' " Open as many windows as possible ! for i in range(500) try exe dir . 'new' catch /E36:/ break endtry ! endfor call writefile(['first', 'second', 'third'], 'Xfile1') call writefile([], 'Xfile2') --- 1013,1025 ---- let dir = (a:dir_arg == 'v') ? 'vert ' : '' " Open as many windows as possible ! while v:true try exe dir . 'new' catch /E36:/ break endtry ! endwhile call writefile(['first', 'second', 'third'], 'Xfile1') call writefile([], 'Xfile2') *** ../vim-8.2.0431/src/version.c 2020-03-23 19:17:25.877431605 +0100 --- src/version.c 2020-03-23 19:26:16.047556142 +0100 *************** *** 740,741 **** --- 740,743 ---- { /* Add new patch number below this line */ + /**/ + 432, /**/ -- "A mouse can be just as dangerous as a bullet or a bomb." (US Representative Lamar Smith, R-Texas) /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///