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/gui.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/gui.c')
| -rw-r--r-- | src/gui.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -603,22 +603,22 @@ gui_init(void) #endif if ( fullpathcmp((char_u *)USR_GVIMRC_FILE, - (char_u *)GVIMRC_FILE, FALSE) != FPC_SAME + (char_u *)GVIMRC_FILE, FALSE, TRUE) != FPC_SAME #ifdef SYS_GVIMRC_FILE && fullpathcmp((char_u *)SYS_GVIMRC_FILE, - (char_u *)GVIMRC_FILE, FALSE) != FPC_SAME + (char_u *)GVIMRC_FILE, FALSE, TRUE) != FPC_SAME #endif #ifdef USR_GVIMRC_FILE2 && fullpathcmp((char_u *)USR_GVIMRC_FILE2, - (char_u *)GVIMRC_FILE, FALSE) != FPC_SAME + (char_u *)GVIMRC_FILE, FALSE, TRUE) != FPC_SAME #endif #ifdef USR_GVIMRC_FILE3 && fullpathcmp((char_u *)USR_GVIMRC_FILE3, - (char_u *)GVIMRC_FILE, FALSE) != FPC_SAME + (char_u *)GVIMRC_FILE, FALSE, TRUE) != FPC_SAME #endif #ifdef USR_GVIMRC_FILE4 && fullpathcmp((char_u *)USR_GVIMRC_FILE4, - (char_u *)GVIMRC_FILE, FALSE) != FPC_SAME + (char_u *)GVIMRC_FILE, FALSE, TRUE) != FPC_SAME #endif ) do_source((char_u *)GVIMRC_FILE, TRUE, DOSO_GVIMRC); |