diff options
| author | Bram Moolenaar <bram@vim.org> | 2013-06-16 16:34:56 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2013-06-16 16:34:56 +0200 |
| commit | bd1b19318157d18df33e3cb920ae0dd91050a44c (patch) | |
| tree | dc6f6863cd236fa51c86f24d79a3bb8cad846558 | |
| parent | aaa8de46e066d17f065f2e68319c254f7be125c3 (diff) | |
| download | vim-bd1b19318157d18df33e3cb920ae0dd91050a44c.tar.gz | |
Problem: 'backupcopy' default on MS-Windows is wrong when 'encoding' equals
the current codepage.
Solution: Change the #else block. (Ken Takata)
| -rw-r--r-- | src/os_win32.c | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index fd7e57e7..123b892e 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) + 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 12b17a9e..abcd2d84 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1210, +/**/ 1209, /**/ 1208, |