mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-13 14:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.2355: test with "man" fails on FreeBSD

Browse Source 
Problem:    Test with "man" fails on FreeBSD.
Solution:   Use "-P" instead of "--pager".
c7d2a57b3a

Cherry-picked "has('bsd')" from vim-patch:8.1.0846.
Cherry-picked test_normal.vim fix from vim-patch:8.1.2358
This commit is contained in:
Jan Edmund Lazo
2019-11-29 05:45:54 -05:00
parent f6e7857c54
commit 7646e73a27
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/eval.c
View File

@@ -11503,6 +11503,9 @@ static void f_glob2regpat(typval_T *argvars, typval_T *rettv, FunPtr fptr)
static void f_has(typval_T *argvars, typval_T *rettv, FunPtr fptr) static void f_has(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{ {
static const char *const has_list[] = { static const char *const has_list[] = {
#if defined(BSD) && !defined(__APPLE__)
"bsd",
#endif
#ifdef UNIX #ifdef UNIX
"unix", "unix",
#endif #endif

7
src/nvim/testdir/test_normal.vim
View File

@@ -1367,8 +1367,9 @@ func Test_normal23_K()
return return
endif endif
if has('mac') let not_gnu_man = has('mac') || has('bsd')
" In MacOS, the option for specifying a pager is different if not_gnu_man
" In MacOS and BSD, the option for specifying a pager is different
set keywordprg=man\ -P\ cat set keywordprg=man\ -P\ cat
else else
set keywordprg=man\ --pager=cat set keywordprg=man\ --pager=cat
@@ -1376,7 +1377,7 @@ func Test_normal23_K()
" Test for using man " Test for using man
2 2
let a = execute('unsilent norm! K') let a = execute('unsilent norm! K')
if has('mac') if not_gnu_man
call assert_match("man -P cat 'man'", a) call assert_match("man -P cat 'man'", a)
else else
call assert_match("man --pager=cat 'man'", a) call assert_match("man --pager=cat 'man'", a)