summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2023-06-23 22:56:47 +0100
committerBram Moolenaar <Bram@vim.org>2023-06-23 22:56:47 +0100
commit813b7a85f2489e9f698239a9fee17c64da68f435 (patch)
tree15c6e9c5cfea57a0c7db1f0238cbf831d31ee297
parentb8b1c8ebd4e62d4567aa16b57b25823b80bfc76f (diff)
patch 9.0.1654: MS-Windows: test for default 'viewdir' failsv9.0.1654
Problem: MS-Windows: test for default 'viewdir' fails. Solution: Escape the pattern.
-rw-r--r--src/testdir/test_mksession.vim3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/test_mksession.vim b/src/testdir/test_mksession.vim
index 0c4838e691..aa291821ec 100644
--- a/src/testdir/test_mksession.vim
+++ b/src/testdir/test_mksession.vim
@@ -1265,7 +1265,8 @@ endfunc
" Test default 'viewdir' value
func Test_mkview_default_home()
if has('win32')
- call assert_match('^' .. $ORIGHOME .. '/vimfiles', &viewdir)
+ " use escape() to handle backslash path separators
+ call assert_match('^' .. escape($ORIGHOME, '\') .. '/vimfiles', &viewdir)
elseif has('unix')
call assert_match('^' .. $ORIGHOME .. '/.vim', &viewdir)
elseif has('amiga')
diff --git a/src/version.c b/src/version.c
index 931bd9718b..4f224c36bc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1654,
+/**/
1653,
/**/
1652,