aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 9.1.0337: Missing entry for XDG vimrc file in :version

Browse Source 
Problem:  Missing entry for XDG vimrc file in :version
Solution: Add 4th user vimrc entry to :version output
          (Diego Viola)

related: #14182
closes: #14569

Signed-off-by: Diego Viola <diego.viola@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Diego Viola
2024-04-16 20:58:45 +02:00
committed by Christian Brabandt
parent 2da68c8b61
commit d1068a2bb0
3 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/os_unix.h
View File

@@ -250,9 +250,9 @@ typedef struct dsc$descriptor DESC;
#endif #endif
#ifndef XDG_VIMRC_FILE #ifndef XDG_VIMRC_FILE
# define XDG_VIMRC_FILE mch_getenv("XDG_CONFIG_HOME") \ # define XDG_VIMRC_FILE (mch_getenv("XDG_CONFIG_HOME") \
? (char_u *)"$XDG_CONFIG_HOME/vim/vimrc" \ ? "$XDG_CONFIG_HOME/vim/vimrc" \
: (char_u *)"~/.config/vim/vimrc" : "~/.config/vim/vimrc")
#endif #endif
#if !defined(USR_VIMRC_FILE3) && defined(VMS) #if !defined(USR_VIMRC_FILE3) && defined(VMS)

17
src/testdir/test_xdg.vim
View File

@@ -137,4 +137,21 @@ func Test_xdg_runtime_files()
unlet $XDG_CONFIG_HOME unlet $XDG_CONFIG_HOME
endfunc endfunc
func Test_xdg_version()
CheckUnix
let $HOME = getcwd() .. '/XfakeHOME'
unlet $XDG_CONFIG_HOME
let a = execute(':version')->split('\n')
let a = filter(a, { _, val -> val =~ '\.config\|XDG_CONFIG_HOME' })
call assert_equal(1, len(a))
call assert_match('\~/.config/vim/vimrc', a[0])
let $XDG_CONFIG_HOME = expand('~/.xdg')
let a = execute(':version')->split('\n')
let a = filter(a, { _, val -> val =~ '\.config\|XDG_CONFIG_HOME' })
call assert_equal(1, len(a))
call assert_match('XDG_CONFIG_HOME/vim/vimrc', a[0])
unlet $XDG_CONFIG_HOME
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab

15
src/version.c
View File

@@ -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 */
/**/
337,
/**/ /**/
336, 336,
/**/ /**/
@@ -1743,10 +1745,21 @@ list_version(void)
version_msg(USR_VIMRC_FILE2); version_msg(USR_VIMRC_FILE2);
version_msg("\"\n"); version_msg("\"\n");
#endif #endif
#ifdef USR_VIMRC_FILE3 #if defined(USR_VIMRC_FILE3) && defined(XDG_VIMRC_FILE)
version_msg(_(" 3rd user vimrc file: \"")); version_msg(_(" 3rd user vimrc file: \""));
version_msg(USR_VIMRC_FILE3); version_msg(USR_VIMRC_FILE3);
version_msg("\"\n"); version_msg("\"\n");
version_msg(_(" 4th user vimrc file: \""));
version_msg((char *)(XDG_VIMRC_FILE));
version_msg("\"\n");
#elif defined(USR_VIMRC_FILE3)
version_msg(_(" 3rd user vimrc file: \""));
version_msg(USR_VIMRC_FILE3);
version_msg("\"\n");
#elif defined(XDG_VIMRC_FILE)
version_msg(_(" 3rd user vimrc file: \""));
version_msg((char *)(XDG_VIMRC_FILE));
version_msg("\"\n");
#endif #endif
#ifdef USR_EXRC_FILE #ifdef USR_EXRC_FILE
version_msg(_(" user exrc file: \"")); version_msg(_(" user exrc file: \""));