summaryrefslogtreecommitdiffstats
path: root/src/crypt.c
diff options
context:
space:
mode:
authorChristian Brabandt <cb@256bit.org>2021-07-25 14:36:05 +0200
committerBram Moolenaar <Bram@vim.org>2021-07-25 14:36:05 +0200
commit8a4c812ede5b01a8e71082c1ff4ebfcbf1bd515f (patch)
tree2da838678bac4dd3d5fa1681e818517421e0e86b /src/crypt.c
parent3ed0d9379683246a77aa8c1a59da7a0ac6395339 (diff)
patch 8.2.3218: when using xchaha20 crypt undo file is not removedv8.2.3218
Problem: When using xchaha20 crypt undo file is not removed. Solution: Reset 'undofile' and delete the file. (Christian Brabandt, closes #8630, closes #8467)
Diffstat (limited to 'src/crypt.c')
-rw-r--r--src/crypt.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/crypt.c b/src/crypt.c
index 1b2ece5db4..fad6df0ddc 100644
--- a/src/crypt.c
+++ b/src/crypt.c
@@ -616,11 +616,8 @@ crypt_check_swapfile_curbuf(void)
// swap and undo files, so disable them
mf_close_file(curbuf, TRUE); // remove the swap file
set_option_value((char_u *)"swf", 0, NULL, OPT_LOCAL);
-#ifdef FEAT_PERSISTENT_UNDO
- set_option_value((char_u *)"udf", 0, NULL, OPT_LOCAL);
-#endif
msg_scroll = TRUE;
- msg(_("Note: Encryption of swapfile not supported, disabling swap- and undofile"));
+ msg(_("Note: Encryption of swapfile not supported, disabling swap file"));
}
}
#endif