summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-11-03 19:00:14 +0100
committerBram Moolenaar <Bram@vim.org>2018-11-03 19:00:14 +0100
commitbd9a0c611ce08f8dce033537bc2f110987b99802 (patch)
treef51342ca120170a54ea5d75460e2042f95fbe250
parent4dbc2627641a6b950c30c31cbf7b7e6c36da1927 (diff)
patch 8.1.0505: filter command test may fail if helplang is not setv8.1.0505
Problem: Filter command test may fail if helplang is not set. Solution: Set 'helplang' for the test. (James McCoy, closes #3591)
-rw-r--r--src/testdir/test_filter_cmd.vim3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/test_filter_cmd.vim b/src/testdir/test_filter_cmd.vim
index 3d802f9530..6f40a902e1 100644
--- a/src/testdir/test_filter_cmd.vim
+++ b/src/testdir/test_filter_cmd.vim
@@ -105,8 +105,11 @@ func Test_filter_commands()
unlet test_filter_c
" Test filtering :set command
+ let helplang=&helplang
+ set helplang=en
let res = join(split(execute("filter /^help/ set"), "\n")[1:], " ")
call assert_match('^\s*helplang=\w*$', res)
+ let &helplang=helplang
" Test filtering :llist command
call setloclist(0, [{"filename": "/path/vim.c"}, {"filename": "/path/vim.h"}, {"module": "Main.Test"}])
diff --git a/src/version.c b/src/version.c
index 2c06a0f391..5da60271ce 100644
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 505,
+/**/
504,
/**/
503,