From 03e114b0f2c994d58cd744f9be1b498245bd8c08 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 16 Jun 2013 16:34:56 +0200 Subject: [PATCH] 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) --- src/os_win32.c | 16 +++++++++------- src/version.c | 2 ++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/os_win32.c b/src/os_win32.c index fd7e57e7f..123b892ec 100644 --- 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) - { - fileFlags = findDataA.dwFileAttributes; - reparseTag = findDataA.dwReserved0; - } + else #endif + { + hFind = FindFirstFile(fname, &findDataA); + if (hFind != INVALID_HANDLE_VALUE) + { + fileFlags = findDataA.dwFileAttributes; + reparseTag = findDataA.dwReserved0; + } + } if (hFind != INVALID_HANDLE_VALUE) FindClose(hFind); diff --git a/src/version.c b/src/version.c index 12b17a9ea..abcd2d848 100644 --- 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, /**/