diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-11-30 14:32:06 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-30 14:32:06 -0800 |
| commit | f700170197819209e70369af7108ace83216b0ea (patch) | |
| tree | 7df89eb001a9c394cb5ca695b9c9d1ce6666da16 /src/nvim/testdir | |
| parent | f6e7857c54a015cdfac9ce65ec0b65d65d590aeb (diff) | |
| parent | 5b60023a8c19fd77c426b0070057b95cae89cd42 (diff) | |
| download | rneovim-f700170197819209e70369af7108ace83216b0ea.tar.gz rneovim-f700170197819209e70369af7108ace83216b0ea.tar.bz2 rneovim-f700170197819209e70369af7108ace83216b0ea.zip | |
Merge #11483 from janlazo/vim-8.1.2355
vim-patch:8.1.{2355,2363}
Diffstat (limited to 'src/nvim/testdir')
| -rw-r--r-- | src/nvim/testdir/test_normal.vim | 7 | ||||
| -rw-r--r-- | src/nvim/testdir/test_statusline.vim | 22 |
2 files changed, 26 insertions, 3 deletions
diff --git a/src/nvim/testdir/test_normal.vim b/src/nvim/testdir/test_normal.vim index eab638d19a..ad6d325510 100644 --- a/src/nvim/testdir/test_normal.vim +++ b/src/nvim/testdir/test_normal.vim @@ -1367,8 +1367,9 @@ func Test_normal23_K() return endif - if has('mac') - " In MacOS, the option for specifying a pager is different + let not_gnu_man = has('mac') || has('bsd') + if not_gnu_man + " In MacOS and BSD, the option for specifying a pager is different set keywordprg=man\ -P\ cat else set keywordprg=man\ --pager=cat @@ -1376,7 +1377,7 @@ func Test_normal23_K() " Test for using man 2 let a = execute('unsilent norm! K') - if has('mac') + if not_gnu_man call assert_match("man -P cat 'man'", a) else call assert_match("man --pager=cat 'man'", a) diff --git a/src/nvim/testdir/test_statusline.vim b/src/nvim/testdir/test_statusline.vim index b86340a23a..48ec777ffd 100644 --- a/src/nvim/testdir/test_statusline.vim +++ b/src/nvim/testdir/test_statusline.vim @@ -347,3 +347,25 @@ func Test_statusline() set laststatus& set splitbelow& endfunc + +func Test_statusline_visual() + func CallWordcount() + call wordcount() + endfunc + new x1 + setl statusline=count=%{CallWordcount()} + " buffer must not be empty + call setline(1, 'hello') + + " window with more lines than x1 + new x2 + call setline(1, range(10)) + $ + " Visual mode in line below liast line in x1 should not give ml_get error + call feedkeys("\<C-V>", "xt") + redraw + + delfunc CallWordcount + bwipe! x1 + bwipe! x2 +endfunc |