Mercurial > vim
diff src/gui.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 | 47a8b29f289c |
| children | ef00b6bc186b |
line wrap: on
line diff
--- a/src/gui.c +++ b/src/gui.c @@ -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);