mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
patch 9.1.0721: tests: test_mksession does not consider XDG_CONFIG_HOME
Problem: tests: test_mksession does not consider XDG_CONFIG_HOME Solution: allow to match $HOME/.vim/ and $HOME/.config/vim for &viewdir (John M Devin) closes: #15639 Signed-off-by: John M Devin <john.m.devin@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
committed by
Christian Brabandt
parent
609599cc45
commit
5b9237c2e7
@@ -34,6 +34,10 @@ if 1
|
|||||||
" defaults before we get here, and test_mksession checks that.
|
" defaults before we get here, and test_mksession checks that.
|
||||||
let $ORIGHOME = $HOME
|
let $ORIGHOME = $HOME
|
||||||
|
|
||||||
|
if !exists('$XDG_CONFIG_HOME')
|
||||||
|
let $XDG_CONFIG_HOME = $HOME .. '/.config'
|
||||||
|
endif
|
||||||
|
|
||||||
" Make sure $HOME does not get read or written.
|
" Make sure $HOME does not get read or written.
|
||||||
" It must exist, gnome tries to create $HOME/.gnome2
|
" It must exist, gnome tries to create $HOME/.gnome2
|
||||||
let $HOME = getcwd() . '/XfakeHOME'
|
let $HOME = getcwd() . '/XfakeHOME'
|
||||||
|
@@ -1270,7 +1270,10 @@ func Test_mkview_default_home()
|
|||||||
" use escape() to handle backslash path separators
|
" use escape() to handle backslash path separators
|
||||||
call assert_match('^' .. escape($ORIGHOME, '\') .. '/vimfiles', &viewdir)
|
call assert_match('^' .. escape($ORIGHOME, '\') .. '/vimfiles', &viewdir)
|
||||||
elseif has('unix')
|
elseif has('unix')
|
||||||
call assert_match('^' .. $ORIGHOME .. '/.vim', &viewdir)
|
call assert_match(
|
||||||
|
\ '^' .. $ORIGHOME .. '/.vim\|' ..
|
||||||
|
\ '^' .. $XDG_CONFIG_HOME .. '/vim'
|
||||||
|
\ , &viewdir)
|
||||||
elseif has('amiga')
|
elseif has('amiga')
|
||||||
call assert_match('^home:vimfiles', &viewdir)
|
call assert_match('^home:vimfiles', &viewdir)
|
||||||
elseif has('mac')
|
elseif has('mac')
|
||||||
|
@@ -704,6 +704,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
721,
|
||||||
/**/
|
/**/
|
||||||
720,
|
720,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user