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)
diff --git a/src/gui.c b/src/gui.c
index da7284f..8568c20 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -603,22 +603,22 @@
#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);