diff options
| -rw-r--r-- | src/testdir/test_xdg.vim | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/testdir/test_xdg.vim b/src/testdir/test_xdg.vim index 7c0c8ef619..6f35b7254a 100644 --- a/src/testdir/test_xdg.vim +++ b/src/testdir/test_xdg.vim @@ -1,7 +1,6 @@ " Tests for the XDG feature source check.vim - source shared.vim func s:get_rcs() @@ -38,7 +37,7 @@ endfunc func Test_xdg_runtime_files() " This tests, that the initialization file from " ~/.vimrc, ~/.vim/vimrc and ~/.config/vim/vimrc (or - " $XDG_HOMECONFIG/vim/vimrc) are sourced in that order + " $XDG_CONFIG_HOME/vim/vimrc) are sourced in that order CheckUnix call mkdir(expand('~/.vim/'), 'pD') call mkdir(expand('~/.config/vim/'), 'pD') @@ -176,9 +175,10 @@ func Test_zzz_xdg_runtime_files() source setup_gui.vim call GUISetUpCommon() - " This tests, that the initialization file from - " ~/.vimrc, ~/.vim/vimrc and ~/.config/vim/vimrc (or - " $XDG_HOMECONFIG/vim/vimrc) are sourced in that order + " This tests, that the GUI initialization file from + " ~/.gvimrc, ~/.vim/gvimrc, ~/.config/vim/gvimrc + " and ~/XDG_CONFIG_HOME/vim/gvimrc is sourced + " when starting GUI mode call mkdir(expand('~/.vim/'), 'pD') call mkdir(expand('~/.config/vim/'), 'pD') call mkdir(expand('~/xdg/vim/'), 'pD') @@ -249,9 +249,6 @@ func Test_zzz_xdg_runtime_files() call delete(rc2) - " XDG_CONFIG_HOME is set in Github CI runners - unlet $XDG_CONFIG_HOME - " Test for ~/.config/vim/gvimrc let lines =<< trim END " Ignore the "failed to create input context" error. diff --git a/src/version.c b/src/version.c index 490d4ad7f4..82bb55bf8b 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 347, +/**/ 346, /**/ 345, |