To: vim_dev@googlegroups.com Subject: Patch 8.1.0721 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.0721 Problem: Conceal mode is not sufficiently tested. Solution: Add screendump tests. Check all 'concealcursor' values. Files: src/testdir/test_conceal.vim, src/Make_all.mak, src/testdir/Make_all.mak src/testdir/dumps/Test_conceal_two_windows_01.dump, src/testdir/dumps/Test_conceal_two_windows_02.dump, src/testdir/dumps/Test_conceal_two_windows_03.dump, src/testdir/dumps/Test_conceal_two_windows_04.dump, src/testdir/dumps/Test_conceal_two_windows_05.dump, src/testdir/dumps/Test_conceal_two_windows_06i.dump, src/testdir/dumps/Test_conceal_two_windows_06v.dump, src/testdir/dumps/Test_conceal_two_windows_06c.dump, src/testdir/dumps/Test_conceal_two_windows_06n.dump, src/testdir/dumps/Test_conceal_two_windows_07i.dump, src/testdir/dumps/Test_conceal_two_windows_07v.dump, src/testdir/dumps/Test_conceal_two_windows_07c.dump, src/testdir/dumps/Test_conceal_two_windows_07n.dump, src/testdir/dumps/Test_conceal_two_windows_08i.dump, src/testdir/dumps/Test_conceal_two_windows_08v.dump, src/testdir/dumps/Test_conceal_two_windows_08c.dump, src/testdir/dumps/Test_conceal_two_windows_08n.dump, src/testdir/dumps/Test_conceal_two_windows_09i.dump, src/testdir/dumps/Test_conceal_two_windows_09v.dump, src/testdir/dumps/Test_conceal_two_windows_09c.dump, src/testdir/dumps/Test_conceal_two_windows_09n.dump *** ../vim-8.1.0720/src/testdir/test_conceal.vim 2019-01-11 15:52:17.828883422 +0100 --- src/testdir/test_conceal.vim 2019-01-11 15:52:58.940581601 +0100 *************** *** 0 **** --- 1,97 ---- + " Tests for 'conceal'. + " Also see test88.in (should be converted to a test function here). + + if !has('conceal') + finish + endif + + source screendump.vim + if !CanRunVimInTerminal() + finish + endif + + func Test_conceal_two_windows() + call writefile([ + \ 'let lines = ["one one one one one", "two |hidden| here", "three |hidden| three"]', + \ 'call setline(1, lines)', + \ 'syntax match test /|hidden|/ conceal', + \ 'set conceallevel=2', + \ 'set concealcursor=', + \ 'exe "normal /here\r"', + \ 'new', + \ 'call setline(1, lines)', + \ 'call setline(4, "Second window")', + \ 'syntax match test /|hidden|/ conceal', + \ 'set conceallevel=2', + \ 'set concealcursor=nc', + \ 'exe "normal /here\r"', + \ ], 'XTest_conceal') + " Check that cursor line is concealed + let buf = RunVimInTerminal('-S XTest_conceal', {}) + call VerifyScreenDump(buf, 'Test_conceal_two_windows_01', {}) + + " Check that with concealed text vertical cursor movement is correct. + call term_sendkeys(buf, "k") + call VerifyScreenDump(buf, 'Test_conceal_two_windows_02', {}) + + " Check that with cursor line is not concealed + call term_sendkeys(buf, "j") + call term_sendkeys(buf, ":set concealcursor=\r") + call VerifyScreenDump(buf, 'Test_conceal_two_windows_03', {}) + + " Check that with cursor line is not concealed when moving cursor down + call term_sendkeys(buf, "j") + call VerifyScreenDump(buf, 'Test_conceal_two_windows_04', {}) + + " Check that with cursor line is not concealed when switching windows + call term_sendkeys(buf, "\\") + call VerifyScreenDump(buf, 'Test_conceal_two_windows_05', {}) + + " Check that with cursor line is only concealed in Normal mode + call term_sendkeys(buf, ":set concealcursor=n\r") + call VerifyScreenDump(buf, 'Test_conceal_two_windows_06n', {}) + call term_sendkeys(buf, "a") + call VerifyScreenDump(buf, 'Test_conceal_two_windows_06i', {}) + call term_sendkeys(buf, "\/e") + call VerifyScreenDump(buf, 'Test_conceal_two_windows_06c', {}) + call term_sendkeys(buf, "\v") + call VerifyScreenDump(buf, 'Test_conceal_two_windows_06v', {}) + call term_sendkeys(buf, "\") + + " Check that with cursor line is only concealed in Insert mode + call term_sendkeys(buf, ":set concealcursor=i\r") + call VerifyScreenDump(buf, 'Test_conceal_two_windows_07n', {}) + call term_sendkeys(buf, "a") + call VerifyScreenDump(buf, 'Test_conceal_two_windows_07i', {}) + call term_sendkeys(buf, "\/e") + call VerifyScreenDump(buf, 'Test_conceal_two_windows_07c', {}) + call term_sendkeys(buf, "\v") + call VerifyScreenDump(buf, 'Test_conceal_two_windows_07v', {}) + call term_sendkeys(buf, "\") + + " Check that with cursor line is only concealed in Command mode + call term_sendkeys(buf, ":set concealcursor=c\r") + call VerifyScreenDump(buf, 'Test_conceal_two_windows_08n', {}) + call term_sendkeys(buf, "a") + call VerifyScreenDump(buf, 'Test_conceal_two_windows_08i', {}) + call term_sendkeys(buf, "\/e") + call VerifyScreenDump(buf, 'Test_conceal_two_windows_08c', {}) + call term_sendkeys(buf, "\v") + call VerifyScreenDump(buf, 'Test_conceal_two_windows_08v', {}) + call term_sendkeys(buf, "\") + + " Check that with cursor line is only concealed in Visual mode + call term_sendkeys(buf, ":set concealcursor=v\r") + call VerifyScreenDump(buf, 'Test_conceal_two_windows_09n', {}) + call term_sendkeys(buf, "a") + call VerifyScreenDump(buf, 'Test_conceal_two_windows_09i', {}) + call term_sendkeys(buf, "\/e") + call VerifyScreenDump(buf, 'Test_conceal_two_windows_09c', {}) + call term_sendkeys(buf, "\v") + call VerifyScreenDump(buf, 'Test_conceal_two_windows_09v', {}) + call term_sendkeys(buf, "\") + + " clean up + call StopVimInTerminal(buf) + call delete('XTest_conceal') + endfunc *** ../vim-8.1.0720/src/Make_all.mak 2018-12-19 21:05:53.908800514 +0100 --- src/Make_all.mak 2019-01-11 15:21:14.402913540 +0100 *************** *** 33,38 **** --- 33,39 ---- test_command_count \ test_comparators \ test_compiler \ + test_conceal \ test_crypt \ test_cscope \ test_cursor_func \ *** ../vim-8.1.0720/src/testdir/Make_all.mak 2018-12-13 22:17:52.881941445 +0100 --- src/testdir/Make_all.mak 2019-01-11 15:21:58.686603771 +0100 *************** *** 84,89 **** --- 84,90 ---- test_cmdline.res \ test_command_count.res \ test_comparators.res \ + test_conceal.res \ test_crypt.res \ test_cscope.res \ test_curswant.res \ *** ../vim-8.1.0720/src/testdir/dumps/Test_conceal_two_windows_01.dump 2019-01-11 15:52:17.840883334 +0100 --- src/testdir/dumps/Test_conceal_two_windows_01.dump 2019-01-11 15:23:29.585967705 +0100 *************** *** 0 **** --- 1,20 ---- + |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1>h|e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |S|e|c|o|n|d| |w|i|n|d|o|w| @61 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1 + |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1|h|e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1 + |/+0&&|h|e|r|e| @69 *** ../vim-8.1.0720/src/testdir/dumps/Test_conceal_two_windows_02.dump 2019-01-11 15:52:17.844883304 +0100 --- src/testdir/dumps/Test_conceal_two_windows_02.dump 2019-01-11 15:23:30.641960314 +0100 *************** *** 0 **** --- 1,20 ---- + |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o>n|e| |o|n|e| @55 + |t|w|o| @1|h|e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |S|e|c|o|n|d| |w|i|n|d|o|w| @61 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|1|,|1|4| @10|A|l@1 + |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1|h|e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1 + |/+0&&|h|e|r|e| @69 *** ../vim-8.1.0720/src/testdir/dumps/Test_conceal_two_windows_03.dump 2019-01-11 15:52:17.848883274 +0100 --- src/testdir/dumps/Test_conceal_two_windows_03.dump 2019-01-11 15:23:31.693952951 +0100 *************** *** 0 **** --- 1,20 ---- + |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| |||h|i|d@1|e|n||| >h|e|r|e| @57 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |S|e|c|o|n|d| |w|i|n|d|o|w| @61 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1 + |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1|h|e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1 + |:+0&&|s|e|t| |c|o|n|c|e|a|l|c|u|r|s|o|r|=| @55 *** ../vim-8.1.0720/src/testdir/dumps/Test_conceal_two_windows_04.dump 2019-01-11 15:52:17.848883274 +0100 --- src/testdir/dumps/Test_conceal_two_windows_04.dump 2019-01-11 15:32:38.541840325 +0100 *************** *** 0 **** --- 1,20 ---- + |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1|h|e|r|e| @65 + |t|h|r|e@1| |||h|i|d@1|e|n>|| |t|h|r|e@1| @54 + |S|e|c|o|n|d| |w|i|n|d|o|w| @61 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1 + |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1|h|e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1 + |:+0&&|s|e|t| |c|o|n|c|e|a|l|c|u|r|s|o|r|=| @55 *** ../vim-8.1.0720/src/testdir/dumps/Test_conceal_two_windows_05.dump 2019-01-11 15:52:17.852883246 +0100 --- src/testdir/dumps/Test_conceal_two_windows_05.dump 2019-01-11 15:31:02.522628265 +0100 *************** *** 0 **** --- 1,20 ---- + |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1|h|e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |S|e|c|o|n|d| |w|i|n|d|o|w| @61 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1 + |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| |||h|i|d@1|e|n||| >h|e|r|e| @57 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1 + |:+0&&|s|e|t| |c|o|n|c|e|a|l|c|u|r|s|o|r|=| @55 *** ../vim-8.1.0720/src/testdir/dumps/Test_conceal_two_windows_06i.dump 2019-01-11 15:52:17.856883216 +0100 --- src/testdir/dumps/Test_conceal_two_windows_06i.dump 2019-01-11 15:43:16.416896159 +0100 *************** *** 0 **** --- 1,20 ---- + |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1|h|e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |S|e|c|o|n|d| |w|i|n|d|o|w| @61 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1 + |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| |||h|i|d@1|e|n||| |h>e|r|e| @57 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|5| @10|A|l@1 + |-+2&&@1| |I|N|S|E|R|T| |-@1| +0&&@62 *** ../vim-8.1.0720/src/testdir/dumps/Test_conceal_two_windows_06v.dump 2019-01-11 15:52:17.860883186 +0100 --- src/testdir/dumps/Test_conceal_two_windows_06v.dump 2019-01-11 15:43:18.512880427 +0100 *************** *** 0 **** --- 1,20 ---- + |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1|h|e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |S|e|c|o|n|d| |w|i|n|d|o|w| @61 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1 + |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| |||h|i|d@1|e|n||| >h|e|r|e| @57 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1 + |-+2&&@1| |V|I|S|U|A|L| |-@1| +0&&@51|1| @9 *** ../vim-8.1.0720/src/testdir/dumps/Test_conceal_two_windows_06c.dump 2019-01-11 15:52:17.864883158 +0100 --- src/testdir/dumps/Test_conceal_two_windows_06c.dump 2019-01-11 15:43:17.464888293 +0100 *************** *** 0 **** --- 1,20 ---- + |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1|h|e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |S|e|c|o|n|d| |w|i|n|d|o|w| @61 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1 + |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| |||h|i|d@1|e|n||| |h|e+1&&|r+0&&|e| @57 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|5| @10|A|l@1 + |/+0&&|e> @72 *** ../vim-8.1.0720/src/testdir/dumps/Test_conceal_two_windows_06n.dump 2019-01-11 15:52:17.868883128 +0100 --- src/testdir/dumps/Test_conceal_two_windows_06n.dump 2019-01-11 15:43:15.364904056 +0100 *************** *** 0 **** --- 1,20 ---- + |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1|h|e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |S|e|c|o|n|d| |w|i|n|d|o|w| @61 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1 + |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1>h|e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1 + |:+0&&|s|e|t| |c|o|n|c|e|a|l|c|u|r|s|o|r|=|n| @54 *** ../vim-8.1.0720/src/testdir/dumps/Test_conceal_two_windows_07i.dump 2019-01-11 15:52:17.868883128 +0100 --- src/testdir/dumps/Test_conceal_two_windows_07i.dump 2019-01-11 15:43:20.616864637 +0100 *************** *** 0 **** --- 1,20 ---- + |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1|h|e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |S|e|c|o|n|d| |w|i|n|d|o|w| @61 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1 + |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1|h>e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|5| @10|A|l@1 + |-+2&&@1| |I|N|S|E|R|T| |-@1| +0&&@62 *** ../vim-8.1.0720/src/testdir/dumps/Test_conceal_two_windows_07v.dump 2019-01-11 15:52:17.872883098 +0100 --- src/testdir/dumps/Test_conceal_two_windows_07v.dump 2019-01-11 15:43:22.728848789 +0100 *************** *** 0 **** --- 1,20 ---- + |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1|h|e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |S|e|c|o|n|d| |w|i|n|d|o|w| @61 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1 + |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| |||h|i|d@1|e|n||| >h|e|r|e| @57 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1 + |-+2&&@1| |V|I|S|U|A|L| |-@1| +0&&@51|1| @9 *** ../vim-8.1.0720/src/testdir/dumps/Test_conceal_two_windows_07c.dump 2019-01-11 15:52:17.876883070 +0100 --- src/testdir/dumps/Test_conceal_two_windows_07c.dump 2019-01-11 15:43:21.672856713 +0100 *************** *** 0 **** --- 1,20 ---- + |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1|h|e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |S|e|c|o|n|d| |w|i|n|d|o|w| @61 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1 + |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| |||h|i|d@1|e|n||| |h|e+1&&|r+0&&|e| @57 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|5| @10|A|l@1 + |/+0&&|e> @72 *** ../vim-8.1.0720/src/testdir/dumps/Test_conceal_two_windows_07n.dump 2019-01-11 15:52:17.880883040 +0100 --- src/testdir/dumps/Test_conceal_two_windows_07n.dump 2019-01-11 15:43:19.564872531 +0100 *************** *** 0 **** --- 1,20 ---- + |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1|h|e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |S|e|c|o|n|d| |w|i|n|d|o|w| @61 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1 + |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| |||h|i|d@1|e|n||| >h|e|r|e| @57 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1 + |:+0&&|s|e|t| |c|o|n|c|e|a|l|c|u|r|s|o|r|=|i| @54 *** ../vim-8.1.0720/src/testdir/dumps/Test_conceal_two_windows_08i.dump 2019-01-11 15:52:17.884883010 +0100 --- src/testdir/dumps/Test_conceal_two_windows_08i.dump 2019-01-11 15:43:24.832833003 +0100 *************** *** 0 **** --- 1,20 ---- + |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1|h|e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |S|e|c|o|n|d| |w|i|n|d|o|w| @61 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1 + |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| |||h|i|d@1|e|n||| |h>e|r|e| @57 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|5| @10|A|l@1 + |-+2&&@1| |I|N|S|E|R|T| |-@1| +0&&@62 *** ../vim-8.1.0720/src/testdir/dumps/Test_conceal_two_windows_08v.dump 2019-01-11 15:52:17.888882980 +0100 --- src/testdir/dumps/Test_conceal_two_windows_08v.dump 2019-01-11 15:43:26.936817220 +0100 *************** *** 0 **** --- 1,20 ---- + |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1|h|e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |S|e|c|o|n|d| |w|i|n|d|o|w| @61 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1 + |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| |||h|i|d@1|e|n||| >h|e|r|e| @57 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1 + |-+2&&@1| |V|I|S|U|A|L| |-@1| +0&&@51|1| @9 *** ../vim-8.1.0720/src/testdir/dumps/Test_conceal_two_windows_08c.dump 2019-01-11 15:52:17.892882952 +0100 --- src/testdir/dumps/Test_conceal_two_windows_08c.dump 2019-01-11 15:43:25.884825111 +0100 *************** *** 0 **** --- 1,20 ---- + |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1|h|e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |S|e|c|o|n|d| |w|i|n|d|o|w| @61 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1 + |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1|h|e+1&&|r+0&&|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|5| @10|A|l@1 + |/+0&&|e> @72 *** ../vim-8.1.0720/src/testdir/dumps/Test_conceal_two_windows_08n.dump 2019-01-11 15:52:17.892882952 +0100 --- src/testdir/dumps/Test_conceal_two_windows_08n.dump 2019-01-11 15:43:23.780840895 +0100 *************** *** 0 **** --- 1,20 ---- + |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1|h|e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |S|e|c|o|n|d| |w|i|n|d|o|w| @61 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1 + |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| |||h|i|d@1|e|n||| >h|e|r|e| @57 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1 + |:+0&&|s|e|t| |c|o|n|c|e|a|l|c|u|r|s|o|r|=|c| @54 *** ../vim-8.1.0720/src/testdir/dumps/Test_conceal_two_windows_09i.dump 2019-01-11 15:52:17.896882922 +0100 --- src/testdir/dumps/Test_conceal_two_windows_09i.dump 2019-01-11 15:43:29.040801437 +0100 *************** *** 0 **** --- 1,20 ---- + |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1|h|e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |S|e|c|o|n|d| |w|i|n|d|o|w| @61 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1 + |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| |||h|i|d@1|e|n||| |h>e|r|e| @57 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|5| @10|A|l@1 + |-+2&&@1| |I|N|S|E|R|T| |-@1| +0&&@62 *** ../vim-8.1.0720/src/testdir/dumps/Test_conceal_two_windows_09v.dump 2019-01-11 15:52:17.900882892 +0100 --- src/testdir/dumps/Test_conceal_two_windows_09v.dump 2019-01-11 15:43:31.132785748 +0100 *************** *** 0 **** --- 1,20 ---- + |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1|h|e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |S|e|c|o|n|d| |w|i|n|d|o|w| @61 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1 + |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1>h|e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1 + |-+2&&@1| |V|I|S|U|A|L| |-@1| +0&&@51|1| @9 *** ../vim-8.1.0720/src/testdir/dumps/Test_conceal_two_windows_09c.dump 2019-01-11 15:52:17.904882864 +0100 --- src/testdir/dumps/Test_conceal_two_windows_09c.dump 2019-01-11 15:43:30.092793549 +0100 *************** *** 0 **** --- 1,20 ---- + |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1|h|e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |S|e|c|o|n|d| |w|i|n|d|o|w| @61 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1 + |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| |||h|i|d@1|e|n||| |h|e+1&&|r+0&&|e| @57 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|5| @10|A|l@1 + |/+0&&|e> @72 *** ../vim-8.1.0720/src/testdir/dumps/Test_conceal_two_windows_09n.dump 2019-01-11 15:52:17.908882834 +0100 --- src/testdir/dumps/Test_conceal_two_windows_09n.dump 2019-01-11 15:43:27.988809328 +0100 *************** *** 0 **** --- 1,20 ---- + |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| @1|h|e|r|e| @65 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |S|e|c|o|n|d| |w|i|n|d|o|w| @61 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1|4| @10|A|l@1 + |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 + |t|w|o| |||h|i|d@1|e|n||| >h|e|r|e| @57 + |t|h|r|e@1| @1|t|h|r|e@1| @62 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1 + |:+0&&|s|e|t| |c|o|n|c|e|a|l|c|u|r|s|o|r|=|v| @54 *** ../vim-8.1.0720/src/version.c 2019-01-11 14:49:25.380107431 +0100 --- src/version.c 2019-01-11 15:06:45.432963118 +0100 *************** *** 797,798 **** --- 797,800 ---- { /* Add new patch number below this line */ + /**/ + 721, /**/ -- hundred-and-one symptoms of being an internet addict: 160. You get in the elevator and double-click the button for the floor you want. /// 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 ///