From 99499b1c05f85f83876b828eea3f6e14f0f407b4 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 23 May 2019 21:35:48 +0200 Subject: 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) --- src/ex_cmds.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/ex_cmds.c') diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 0174fd6b0..040514cdc 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -7002,7 +7002,8 @@ fix_help_buffer(void) copy_option_part(&p, NameBuff, MAXPATHL, ","); mustfree = FALSE; rt = vim_getenv((char_u *)"VIMRUNTIME", &mustfree); - if (rt != NULL && fullpathcmp(rt, NameBuff, FALSE) != FPC_SAME) + if (rt != NULL && + fullpathcmp(rt, NameBuff, FALSE, TRUE) != FPC_SAME) { int fcount; char_u **fnames; @@ -7224,7 +7225,7 @@ helptags_one( */ ga_init2(&ga, (int)sizeof(char_u *), 100); if (add_help_tags || fullpathcmp((char_u *)"$VIMRUNTIME/doc", - dir, FALSE) == FPC_SAME) + dir, FALSE, TRUE) == FPC_SAME) { if (ga_grow(&ga, 1) == FAIL) got_int = TRUE; -- cgit v1.2.1