updated for version 7.3.1210

Problem:    'backupcopy' default on MS-Windows is wrong when 'encoding' equals
            the current codepage.
Solution:   Change the #else block. (Ken Takata)

diff --git a/src/os_win32.c b/src/os_win32.c
index fd7e57e7f2789757d2a3854174dc259da2451346..123b892ec3f54ab5a4f0f36fb64880bb7eacdfcd 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -2789,14 +2789,16 @@ mch_is_symbolic_link(char_u *fname)
            reparseTag = findDataW.dwReserved0;
        }
     }
-#else
-    hFind = FindFirstFile(fname, &findDataA);
-    if (hFind != INVALID_HANDLE_VALUE)
+    else
+#endif
     {
-       fileFlags = findDataA.dwFileAttributes;
-       reparseTag = findDataA.dwReserved0;
+       hFind = FindFirstFile(fname, &findDataA);
+       if (hFind != INVALID_HANDLE_VALUE)
+       {
+           fileFlags = findDataA.dwFileAttributes;
+           reparseTag = findDataA.dwReserved0;
+       }
     }
-#endif
 
     if (hFind != INVALID_HANDLE_VALUE)
        FindClose(hFind);

diff --git a/src/version.c b/src/version.c
index 12b17a9ea5698df3f59caeac8b860385561f821d..abcd2d84800a91eb54c341f90bc479665d6e094b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1210,
 /**/
     1209,
 /**/