aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.0.1028: MS-Windows: viminfo uses $VIM/_viminfo if $HOME not set

Browse Source 
Problem:    MS-Windows: viminfo uses $VIM/_viminfo if $HOME not set. (Yongwei
            Wu)
Solution:   Use vim_getenv() but check it's returning the default "C:/".
This commit is contained in:
Bram Moolenaar
2017-08-31 20:42:18 +02:00
parent 2db0ec4b2e
commit 3d593c2dc9
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ex_cmds.c
View File

@@ -2098,11 +2098,16 @@ viminfo_filename(char_u *file)
else if ((file = find_viminfo_parameter('n')) == NULL || *file == NUL) else if ((file = find_viminfo_parameter('n')) == NULL || *file == NUL)
{ {
#ifdef VIMINFO_FILE2 #ifdef VIMINFO_FILE2
/* don't use $HOME when not defined (turned into "c:/"!). */
# ifdef VMS # ifdef VMS
if (mch_getenv((char_u *)"SYS$LOGIN") == NULL) if (mch_getenv((char_u *)"SYS$LOGIN") == NULL)
# else # else
# ifdef MSWIN
/* Use $VIM only if $HOME is the default "C:/". */
if (STRCMP(vim_getenv((char_u *)"HOME", NULL), "C:/") == 0
&& mch_getenv((char_u *)"HOME") == NULL)
# else
if (mch_getenv((char_u *)"HOME") == NULL) if (mch_getenv((char_u *)"HOME") == NULL)
# endif
# endif # endif
{ {
/* don't use $VIM when not available. */ /* don't use $VIM when not available. */

2
src/version.c
View File

@@ -769,6 +769,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 */
/**/
1028,
/**/ /**/
1027, 1027,
/**/ /**/