diff options
author | Bram Moolenaar <Bram@vim.org> | 2010-07-25 16:05:19 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2010-07-25 16:05:19 +0200 |
commit | fa0ff9aedf9515638e15726141c4a08ca4e05255 (patch) | |
tree | 5905078139923e4721338380895942e33f09844f /src/fileio.c | |
parent | 8d9b40e71ab62f43c65a52225cb833ecc0d1bf6b (diff) | |
download | vim-git-fa0ff9aedf9515638e15726141c4a08ca4e05255.tar.gz |
Fix: editing a not encrypted file after a crypted file messed up reading the
text from an undo file.
Diffstat (limited to 'src/fileio.c')
-rw-r--r-- | src/fileio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fileio.c b/src/fileio.c index 1c0ac8580..c7a2b749e 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -2953,7 +2953,7 @@ check_for_cryptkey(cryptkey, ptr, sizep, filesizep, newfile, fname, did_ask) } /* When starting to edit a new file which does not have encryption, clear * the 'key' option, except when starting up (called with -x argument) */ - else if (newfile && *curbuf->b_p_key && !starting) + else if (newfile && *curbuf->b_p_key != NUL && !starting) set_option_value((char_u *)"key", 0L, (char_u *)"", OPT_LOCAL); return cryptkey; |