mirror of
https://github.com/vim/vim.git
synced 2025-09-26 04:04:07 -04:00
patch 9.1.0347: A few typos in test_xdg when testing gvimrc
Problem: A few typos in test_xdg when testing gvimrc Solution: Fix them (Diego Viola) closes: #14584 Signed-off-by: Diego Viola <diego.viola@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
committed by
Christian Brabandt
parent
1433ac93eb
commit
133ed2a592
@@ -1,7 +1,6 @@
|
|||||||
" Tests for the XDG feature
|
" Tests for the XDG feature
|
||||||
|
|
||||||
source check.vim
|
source check.vim
|
||||||
|
|
||||||
source shared.vim
|
source shared.vim
|
||||||
|
|
||||||
func s:get_rcs()
|
func s:get_rcs()
|
||||||
@@ -38,7 +37,7 @@ endfunc
|
|||||||
func Test_xdg_runtime_files()
|
func Test_xdg_runtime_files()
|
||||||
" This tests, that the initialization file from
|
" This tests, that the initialization file from
|
||||||
" ~/.vimrc, ~/.vim/vimrc and ~/.config/vim/vimrc (or
|
" ~/.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
|
CheckUnix
|
||||||
call mkdir(expand('~/.vim/'), 'pD')
|
call mkdir(expand('~/.vim/'), 'pD')
|
||||||
call mkdir(expand('~/.config/vim/'), 'pD')
|
call mkdir(expand('~/.config/vim/'), 'pD')
|
||||||
@@ -176,9 +175,10 @@ func Test_zzz_xdg_runtime_files()
|
|||||||
source setup_gui.vim
|
source setup_gui.vim
|
||||||
call GUISetUpCommon()
|
call GUISetUpCommon()
|
||||||
|
|
||||||
" This tests, that the initialization file from
|
" This tests, that the GUI initialization file from
|
||||||
" ~/.vimrc, ~/.vim/vimrc and ~/.config/vim/vimrc (or
|
" ~/.gvimrc, ~/.vim/gvimrc, ~/.config/vim/gvimrc
|
||||||
" $XDG_HOMECONFIG/vim/vimrc) are sourced in that order
|
" and ~/XDG_CONFIG_HOME/vim/gvimrc is sourced
|
||||||
|
" when starting GUI mode
|
||||||
call mkdir(expand('~/.vim/'), 'pD')
|
call mkdir(expand('~/.vim/'), 'pD')
|
||||||
call mkdir(expand('~/.config/vim/'), 'pD')
|
call mkdir(expand('~/.config/vim/'), 'pD')
|
||||||
call mkdir(expand('~/xdg/vim/'), 'pD')
|
call mkdir(expand('~/xdg/vim/'), 'pD')
|
||||||
@@ -249,9 +249,6 @@ func Test_zzz_xdg_runtime_files()
|
|||||||
|
|
||||||
call delete(rc2)
|
call delete(rc2)
|
||||||
|
|
||||||
" XDG_CONFIG_HOME is set in Github CI runners
|
|
||||||
unlet $XDG_CONFIG_HOME
|
|
||||||
|
|
||||||
" Test for ~/.config/vim/gvimrc
|
" Test for ~/.config/vim/gvimrc
|
||||||
let lines =<< trim END
|
let lines =<< trim END
|
||||||
" Ignore the "failed to create input context" error.
|
" Ignore the "failed to create input context" error.
|
||||||
|
@@ -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 */
|
||||||
|
/**/
|
||||||
|
347,
|
||||||
/**/
|
/**/
|
||||||
346,
|
346,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user