aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/tag.c
diff options
context:
space:
mode:
authorJurica Bradarić <jbradaric@users.noreply.github.com>2019-10-06 05:35:48 +0200
committerJustin M. Keyes <justinkz@gmail.com>2019-10-05 20:35:48 -0700
commitfe074611cd5b3319a3f639f68289df6a718e64eb (patch)
treef6709dc199d929ddeb75e98b74e74a894b4b5c6c /src/nvim/tag.c
parent1396cc9abb0dfcdbd9572706235aba59f7c3318a (diff)
downloadrneovim-fe074611cd5b3319a3f639f68289df6a718e64eb.tar.gz
rneovim-fe074611cd5b3319a3f639f68289df6a718e64eb.tar.bz2
rneovim-fe074611cd5b3319a3f639f68289df6a718e64eb.zip
vim-patch:8.1.1371: cannot recover from a swap file #11081
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 vim/vim#4369) https://github.com/vim/vim/commit/99499b1c05f85f83876b828eea3f6e14f0f407b4
Diffstat (limited to 'src/nvim/tag.c')
-rw-r--r--src/nvim/tag.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/tag.c b/src/nvim/tag.c
index 91f3da1793..6fe3efbaae 100644
--- a/src/nvim/tag.c
+++ b/src/nvim/tag.c
@@ -2666,7 +2666,8 @@ static int test_for_current(char_u *fname, char_u *fname_end, char_u *tag_fname,
*fname_end = NUL;
}
fullname = expand_tag_fname(fname, tag_fname, true);
- retval = (path_full_compare(fullname, buf_ffname, true) & kEqualFiles);
+ retval = (path_full_compare(fullname, buf_ffname, true, true)
+ & kEqualFiles);
xfree(fullname);
*fname_end = c;
}