summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-11-28 21:16:06 +0100
committerBram Moolenaar <Bram@vim.org>2019-11-28 21:16:06 +0100
commitc7d2a57b3a076f6ecb16f93c0b09280c4b3b4175 (patch)
tree0af2e4cceb9e0764dfec04ebf174d6792affb444
parent31ff2e1b43f5c85fdabfcfce93192405e6e559e2 (diff)
downloadvim-git-c7d2a57b3a076f6ecb16f93c0b09280c4b3b4175.tar.gz
patch 8.1.2355: test with "man" fails on FreeBSDv8.1.2355
Problem: Test with "man" fails on FreeBSD. Solution: Use "-P" instead of "--pager".
-rw-r--r--src/testdir/test_normal.vim4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
index c4b38b1c6..bbb999386 100644
--- a/src/testdir/test_normal.vim
+++ b/src/testdir/test_normal.vim
@@ -1204,8 +1204,8 @@ func Test_normal23_K()
return
endif
- if has('mac')
- " In MacOS, the option for specifying a pager is different
+ if has('mac') || has('bsd')
+ " In MacOS and BSD, the option for specifying a pager is different
set keywordprg=man\ -P\ cat
else
set keywordprg=man\ --pager=cat
diff --git a/src/version.c b/src/version.c
index b3b48d486..4ca5c0f76 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2355,
+/**/
2354,
/**/
2353,