patch 9.1.0347: A few typos in test_xdg when testing gvimrc
Commit:
https://github.com/vim/vim/commit/133ed2a592e4d7998a8f6afa3de9f057feb23f0a
Author: Diego Viola <diego.vi...@gmail.com>
Date: Thu Apr 18 20:54:06 2024 +0200
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.vi...@gmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/src/testdir/test_xdg.vim b/src/testdir/test_xdg.vim
index 7c0c8ef61..6f35b7254 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 490d4ad7f..82bb55bf8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 347,
/**/
346,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1rxWzQ-000m9D-86%40256bit.org.
