diff options
author | ZyX <kp-pav@yandex.ru> | 2015-08-08 14:26:38 +0300 |
---|---|---|
committer | ZyX <kp-pav@yandex.ru> | 2015-10-08 22:00:30 +0300 |
commit | 42fbfd3aee79961ba68d4f45af5e1926d7aa97a0 (patch) | |
tree | 3fecf9e9667c52c7876dd94d64851883e17a5ee1 /src | |
parent | 1542fc221e52f31d5102730a222b5dbbae782dcd (diff) | |
download | rneovim-42fbfd3aee79961ba68d4f45af5e1926d7aa97a0.tar.gz rneovim-42fbfd3aee79961ba68d4f45af5e1926d7aa97a0.tar.bz2 rneovim-42fbfd3aee79961ba68d4f45af5e1926d7aa97a0.zip |
shada: Add warning about removing/renaming temporary file
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/shada.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/nvim/shada.c b/src/nvim/shada.c index bd3fd731e3..40037026a1 100644 --- a/src/nvim/shada.c +++ b/src/nvim/shada.c @@ -3001,11 +3001,13 @@ shada_write_file_nomerge: {} if (!nomerge) { sd_reader.close(&sd_reader); + bool did_remove = false; if (sw_ret == kSDWriteSuccessfull) { if (vim_rename(tempname, fname) == -1) { EMSG3(_(RNERR "Can't rename ShaDa file from %s to %s!"), tempname, fname); } else { + did_remove = true; os_remove(tempname); } } else { @@ -3017,6 +3019,10 @@ shada_write_file_nomerge: {} "during writing it"), tempname, fname); } } + if (!did_remove) { + EMSG3(_(RNERR "Do not forget to remove %s or rename it manually to %s."), + tempname, fname); + } xfree(tempname); } |