summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-01-27 20:43:41 +0100
committerBram Moolenaar <Bram@vim.org>2019-01-27 20:43:41 +0100
commit346d2a359a6874be6cdb683a8d190ba13aa10e94 (patch)
tree298ee56b4200d654114e64e6a77f65d991826c97
parent3e9d4d85c4b5602f072be76b51865050d51fb3c4 (diff)
downloadvim-git-346d2a359a6874be6cdb683a8d190ba13aa10e94.tar.gz
patch 8.1.0836: user completion test can fail on MS-Windowsv8.1.0836
Problem: User completion test can fail on MS-Windows. Solution: Allow for other names befor "Administrator".
-rw-r--r--src/testdir/test_cmdline.vim3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 4dcda858e..02eeb6b8c 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -430,8 +430,9 @@ func Test_cmdline_complete_user_names()
let names = system('net user')
if names =~ 'Administrator'
" Trying completion of :e ~A should complete to Administrator.
+ " There could be other names starting with "A" before Administrator.
call feedkeys(':e ~A' . "\<c-a>\<c-B>\"\<cr>", 'tx')
- call assert_match('^"e \~Administrator', @:)
+ call assert_match('^"e \~.*Administrator', @:)
endif
endif
endfunc
diff --git a/src/version.c b/src/version.c
index 31bf37893..dac3c62c5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -784,6 +784,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 836,
+/**/
835,
/**/
834,