mirror of
https://github.com/vim/vim.git
synced 2025-09-30 04:44:14 -04:00
patch 7.4.906
Problem: On MS-Windows the viminfo file is (always) given the hidden attribute. (raulnac) Solution: Check the hidden attribute in a different way. (Ken Takata)
This commit is contained in:
@@ -1795,7 +1795,7 @@ write_viminfo(file, forceit)
|
|||||||
struct stat st_old; /* mch_stat() of existing viminfo file */
|
struct stat st_old; /* mch_stat() of existing viminfo file */
|
||||||
#endif
|
#endif
|
||||||
#ifdef WIN3264
|
#ifdef WIN3264
|
||||||
long perm = -1;
|
int hidden = FALSE;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (no_viminfo())
|
if (no_viminfo())
|
||||||
@@ -1858,7 +1858,7 @@ write_viminfo(file, forceit)
|
|||||||
#endif
|
#endif
|
||||||
#ifdef WIN3264
|
#ifdef WIN3264
|
||||||
/* Get the file attributes of the existing viminfo file. */
|
/* Get the file attributes of the existing viminfo file. */
|
||||||
perm = mch_getperm(fname);
|
hidden = mch_ishidden(fname);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -2033,7 +2033,7 @@ write_viminfo(file, forceit)
|
|||||||
|
|
||||||
#ifdef WIN3264
|
#ifdef WIN3264
|
||||||
/* If the viminfo file was hidden then also hide the new file. */
|
/* If the viminfo file was hidden then also hide the new file. */
|
||||||
if (perm > 0 && (perm & FILE_ATTRIBUTE_HIDDEN))
|
if (hidden)
|
||||||
mch_hide(fname);
|
mch_hide(fname);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@@ -3097,6 +3097,20 @@ mch_hide(char_u *name)
|
|||||||
win32_setattrs(name, attrs);
|
win32_setattrs(name, attrs);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Return TRUE if file "name" exists and is hidden.
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
mch_ishidden(char_u *name)
|
||||||
|
{
|
||||||
|
int f = win32_getattrs(name);
|
||||||
|
|
||||||
|
if (f == -1)
|
||||||
|
return FALSE; /* file does not exist at all */
|
||||||
|
|
||||||
|
return (f & FILE_ATTRIBUTE_HIDDEN) != 0;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* return TRUE if "name" is a directory
|
* return TRUE if "name" is a directory
|
||||||
* return FALSE if "name" is not a directory or upon error
|
* return FALSE if "name" is not a directory or upon error
|
||||||
|
@@ -741,6 +741,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 */
|
||||||
|
/**/
|
||||||
|
906,
|
||||||
/**/
|
/**/
|
||||||
905,
|
905,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user