Mercurial > vim
comparison src/if_cscope.c @ 16738:b52ea9c5f1db v8.1.1371
patch 8.1.1371: cannot recover from a swap file
commit https://github.com/vim/vim/commit/99499b1c05f85f83876b828eea3f6e14f0f407b4
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu May 23 21:35:48 2019 +0200
patch 8.1.1371: cannot recover from a swap file
Problem: Cannot recover from a swap file.
Solution: Do not expand environment variables in the swap file name.
Do not check the extension when we already know a file is a swap
file. (Ken Takata, closes 4415, closes #4369)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 23 May 2019 21:45:07 +0200 |
parents | 7fad90423bd2 |
children | ef00b6bc186b |
comparison
equal
deleted
inserted
replaced
16737:e56018f01ba7 | 16738:b52ea9c5f1db |
---|---|
1399 { | 1399 { |
1400 if (csinfo[j].fname != NULL | 1400 if (csinfo[j].fname != NULL |
1401 #if defined(UNIX) | 1401 #if defined(UNIX) |
1402 && csinfo[j].st_dev == sb->st_dev && csinfo[j].st_ino == sb->st_ino | 1402 && csinfo[j].st_dev == sb->st_dev && csinfo[j].st_ino == sb->st_ino |
1403 #else | 1403 #else |
1404 /* compare pathnames first */ | 1404 // compare pathnames first |
1405 && ((fullpathcmp((char_u *)csinfo[j].fname, | 1405 && ((fullpathcmp((char_u *)csinfo[j].fname, |
1406 (char_u *)fname, FALSE) & FPC_SAME) | 1406 (char_u *)fname, FALSE, TRUE) & FPC_SAME) |
1407 /* test index file attributes too */ | 1407 // test index file attributes too |
1408 || (csinfo[j].nVolume == bhfi.dwVolumeSerialNumber | 1408 || (csinfo[j].nVolume == bhfi.dwVolumeSerialNumber |
1409 && csinfo[j].nIndexHigh == bhfi.nFileIndexHigh | 1409 && csinfo[j].nIndexHigh == bhfi.nFileIndexHigh |
1410 && csinfo[j].nIndexLow == bhfi.nFileIndexLow)) | 1410 && csinfo[j].nIndexLow == bhfi.nFileIndexLow)) |
1411 #endif | 1411 #endif |
1412 ) | 1412 ) |