Navigation Menu

Skip to content

Commit

Permalink
patch 8.0.1653: screen dump is made too soon
Browse files Browse the repository at this point in the history
Problem:    Screen dump is made too soon.
Solution:   Wait until the ruler is displayed. (Ozaki Kiichi, closes #2755)
  • Loading branch information
brammool committed Mar 29, 2018
1 parent f06b0b6 commit 1834d37
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/testdir/dumps/Test_popup_command_01.dump
@@ -1,5 +1,5 @@
|o+0&#ffffff0|n|e| |t|w|o| |t|h|r|e@1| |f|o|u|r| |f|i|v|e| @51
|a|n|d| |o|n|e| |t|w|o| |X|t|h|r|e@1| |f|o|u|r| |f|i|v|e| @46
|a|n|d| |o|n|e| |t|w|o| >X|t|h|r|e@1| |f|o|u|r| |f|i|v|e| @46
|o|n|e| |m|o|r|e| |t|w| +0#0000001#ffd7ff255|U|n|d|o| @12| +0#0000000#ffffff0@45
|~+0#4040ff13&| @9| +0#0000001#ffd7ff255@17| +0#4040ff13#ffffff0@45
|~| @9| +0#0000001#ffd7ff255|P|a|s|t|e| @11| +0#4040ff13#ffffff0@45
Expand All @@ -17,4 +17,4 @@
|~| @73
|~| @73
|~| @73
|:+0#0000000&|p|o|p|u|p| |P|o|p|U|p| @34|:| @8> @17
|:+0#0000000&|p|o|p|u|p| |P|o|p|U|p| @62
2 changes: 1 addition & 1 deletion src/testdir/dumps/Test_popup_command_02.dump
Expand Up @@ -17,4 +17,4 @@
|~| @73
|~| @73
|~| @73
|:+0#0000000&|p|o|p|u|p| |P|o|p|U|p| @34|:| @8| @17
|:+0#0000000&|p|o|p|u|p| |P|o|p|U|p| @62
3 changes: 3 additions & 0 deletions src/testdir/screendump.vim
Expand Up @@ -59,6 +59,9 @@ func RunVimInTerminal(arguments, options)
let buf = term_start(cmd, {'curwin': 1, 'term_rows': rows, 'term_cols': cols})
call assert_equal([rows, cols], term_getsize(buf))

" Wait for the ruler (in the status line) to be shown.
call WaitFor({-> len(term_getline(buf, rows)) >= cols - 1})

return buf
endfunc

Expand Down
2 changes: 2 additions & 0 deletions src/testdir/test_autocmd.vim
Expand Up @@ -1315,6 +1315,8 @@ func Test_Changed_FirstTime()
call writefile([''], 'Xchanged.txt')
let buf = term_start([GetVimProg(), '--clean', '-c', 'set noswapfile'], {'term_rows': 3})
call assert_equal('running', term_getstatus(buf))
" Wait for the ruler (in the status line) to be shown.
call WaitFor({-> term_getline(buf, 3) =~# '\<All$'})
" It's only adding autocmd, so that no event occurs.
call term_sendkeys(buf, ":au! TextChanged <buffer> call writefile(['No'], 'Xchanged.txt')\<cr>")
call term_sendkeys(buf, "\<C-\\>\<C-N>:qa!\<cr>")
Expand Down
2 changes: 1 addition & 1 deletion src/testdir/test_terminal.vim
Expand Up @@ -975,7 +975,7 @@ endfunction
func Check_dump01(off)
call assert_equal('one two three four five', trim(getline(a:off + 1)))
call assert_equal('~ Select Word', trim(getline(a:off + 7)))
call assert_equal(':popup PopUp :', trim(getline(a:off + 20)))
call assert_equal(':popup PopUp', trim(getline(a:off + 20)))
endfunc

func Test_terminal_dumpwrite_composing()
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -762,6 +762,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1653,
/**/
1652,
/**/
Expand Down

0 comments on commit 1834d37

Please sign in to comment.