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)

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 4650a4e8c9708f591796afea53f08d2b5f17523d..b23f158f4fe5c15ec6378407e4326b7e26a0966f 100644 (file)
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -1795,7 +1795,7 @@ write_viminfo(file, forceit)
     struct stat        st_old;         /* mch_stat() of existing viminfo file */
 #endif
 #ifdef WIN3264
-    long       perm = -1;
+    int                hidden = FALSE;
 #endif
 
     if (no_viminfo())
@@ -1858,7 +1858,7 @@ write_viminfo(file, forceit)
 #endif
 #ifdef WIN3264
        /* Get the file attributes of the existing viminfo file. */
-       perm = mch_getperm(fname);
+       hidden = mch_ishidden(fname);
 #endif
 
        /*
@@ -2033,7 +2033,7 @@ write_viminfo(file, forceit)
 
 #ifdef WIN3264
        /* If the viminfo file was hidden then also hide the new file. */
-       if (perm > 0 && (perm & FILE_ATTRIBUTE_HIDDEN))
+       if (hidden)
            mch_hide(fname);
 #endif
     }

diff --git a/src/os_win32.c b/src/os_win32.c
index 25c63e0c07864960954b04ddada3d2d2eb89eafc..2cfd8f34ae75125fb0d075c52ff5879e110dbc28 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -3097,6 +3097,20 @@ mch_hide(char_u *name)
     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 FALSE if "name" is not a directory or upon error

diff --git a/src/version.c b/src/version.c
index 4f461fe37c7e2b9ca490eea41bb21a64ac8da5b1..8e20841df71662dc036b11073b670ed3876fc396 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    906,
 /**/
     905,
 /**/