diff --git a/src/os_win32.c b/src/os_win32.c
index db3c794..48cc4c5 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -2717,21 +2717,19 @@
 
 
 /*
- * set file permission for `name' to `perm'
+ * Set file permission for "name" to "perm".
  *
- * return FAIL for failure, OK otherwise
+ * Return FAIL for failure, OK otherwise.
  */
     int
-mch_setperm(
-    char_u  *name,
-    long    perm)
+mch_setperm(char_u *name, long perm)
 {
-    long	n;
+    long	n = -1;
+
 #ifdef FEAT_MBYTE
-    WCHAR *p;
     if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
     {
-	p = enc_to_utf16(name, NULL);
+	WCHAR *p = enc_to_utf16(name, NULL);
 
 	if (p != NULL)
 	{
@@ -2742,7 +2740,7 @@
 	    /* Retry with non-wide function (for Windows 98). */
 	}
     }
-    if (p == NULL)
+    if (n == -1)
 #endif
 	n = _chmod(name, perm);
     if (n == -1)
diff --git a/src/version.c b/src/version.c
index f1d5214..f35c8b9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    40,
+/**/
     39,
 /**/
     38,