diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-11-29 05:45:54 -0500 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-11-30 11:42:31 -0500 |
| commit | 7646e73a27bd3cdd343880ea5127b7bed330340b (patch) | |
| tree | 33c922e408c2153c9d71206f9e22e1cc72440870 | |
| parent | f6e7857c54a015cdfac9ce65ec0b65d65d590aeb (diff) | |
| download | rneovim-7646e73a27bd3cdd343880ea5127b7bed330340b.tar.gz rneovim-7646e73a27bd3cdd343880ea5127b7bed330340b.tar.bz2 rneovim-7646e73a27bd3cdd343880ea5127b7bed330340b.zip | |
vim-patch:8.1.2355: test with "man" fails on FreeBSD
Problem: Test with "man" fails on FreeBSD.
Solution: Use "-P" instead of "--pager".
https://github.com/vim/vim/commit/c7d2a57b3a076f6ecb16f93c0b09280c4b3b4175
Cherry-picked "has('bsd')" from vim-patch:8.1.0846.
Cherry-picked test_normal.vim fix from vim-patch:8.1.2358
| -rw-r--r-- | src/nvim/eval.c | 3 | ||||
| -rw-r--r-- | src/nvim/testdir/test_normal.vim | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 5229a81288..1ab25b33b2 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -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 const char *const has_list[] = { +#if defined(BSD) && !defined(__APPLE__) + "bsd", +#endif #ifdef UNIX "unix", #endif 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) |