diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-05-23 21:35:48 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-05-23 21:35:48 +0200 |
| commit | 99499b1c05f85f83876b828eea3f6e14f0f407b4 (patch) | |
| tree | 88da7aeb6c66daf0c6555388952334efa8cb642e /src/if_cscope.c | |
| parent | 05b8b07e2770b66ab77fdb5e195cae809959bdab (diff) | |
patch 8.1.1371: cannot recover from a swap filev8.1.1371
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)
Diffstat (limited to 'src/if_cscope.c')
| -rw-r--r-- | src/if_cscope.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/if_cscope.c b/src/if_cscope.c index 03346749c9..93a0458b4f 100644 --- a/src/if_cscope.c +++ b/src/if_cscope.c @@ -1401,10 +1401,10 @@ cs_insert_filelist( #if defined(UNIX) && csinfo[j].st_dev == sb->st_dev && csinfo[j].st_ino == sb->st_ino #else - /* compare pathnames first */ + // compare pathnames first && ((fullpathcmp((char_u *)csinfo[j].fname, - (char_u *)fname, FALSE) & FPC_SAME) - /* test index file attributes too */ + (char_u *)fname, FALSE, TRUE) & FPC_SAME) + // test index file attributes too || (csinfo[j].nVolume == bhfi.dwVolumeSerialNumber && csinfo[j].nIndexHigh == bhfi.nFileIndexHigh && csinfo[j].nIndexLow == bhfi.nFileIndexLow)) |