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/proto | |
| parent | 05b8b07e2770b66ab77fdb5e195cae809959bdab (diff) | |
| download | vim-git-99499b1c05f85f83876b828eea3f6e14f0f407b4.tar.gz | |
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/proto')
| -rw-r--r-- | src/proto/memline.pro | 2 | ||||
| -rw-r--r-- | src/proto/misc1.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/proto/memline.pro b/src/proto/memline.pro index 57cc76760..3199ba98e 100644 --- a/src/proto/memline.pro +++ b/src/proto/memline.pro @@ -9,7 +9,7 @@ void ml_close(buf_T *buf, int del_file); void ml_close_all(int del_file); void ml_close_notmod(void); void ml_timestamp(buf_T *buf); -void ml_recover(void); +void ml_recover(int checkext); int recover_names(char_u *fname, int list, int nr, char_u **fname_out); char_u *make_percent_swname(char_u *dir, char_u *name); void get_b0_dict(char_u *fname, dict_T *d); diff --git a/src/proto/misc1.pro b/src/proto/misc1.pro index ed8e99c08..3f58d3046 100644 --- a/src/proto/misc1.pro +++ b/src/proto/misc1.pro @@ -45,7 +45,7 @@ char_u *get_users(expand_T *xp, int idx); int match_user(char_u *name); void home_replace(buf_T *buf, char_u *src, char_u *dst, int dstlen, int one); char_u *home_replace_save(buf_T *buf, char_u *src); -int fullpathcmp(char_u *s1, char_u *s2, int checkname); +int fullpathcmp(char_u *s1, char_u *s2, int checkname, int expandenv); char_u *gettail(char_u *fname); char_u *gettail_sep(char_u *fname); char_u *getnextcomp(char_u *fname); |