aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

Fix: editing a not encrypted file after a crypted file messed up reading the

Browse Source 
text from an undo file.
This commit is contained in:
Bram Moolenaar 2010-07-25 16:05:19 +02:00
parent 8d9b40e71a
commit fa0ff9aedf
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/doc/syntax.txt
View File

@ -1,4 +1,4 @@
*syntax.txt* For Vim version 7.3b. Last change: 2010 Jul 24 *syntax.txt* For Vim version 7.3b. Last change: 2010 Jul 25
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -429,7 +429,7 @@ shorter and valid HTML 4 file), use: >
:let g:html_use_css = 1 :let g:html_use_css = 1
Concealed text is removed from the HTML and replaced with the appropriate Concealed text is removed from the HTML and replaced with the appropriate
character from |syn-cchar| or 'listchars' depending on the current value of character from |:syn-cchar| or 'listchars' depending on the current value of
'conceallevel'. If you always want to display all text in your document, 'conceallevel'. If you always want to display all text in your document,
either set 'conceallevel' to before invoking 2html, or use: > either set 'conceallevel' to before invoking 2html, or use: >
:let g:html_ignore_conceal = 1 :let g:html_ignore_conceal = 1

2
src/fileio.c
View File

@ -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 /* When starting to edit a new file which does not have encryption, clear
* the 'key' option, except when starting up (called with -x argument) */ * 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); set_option_value((char_u *)"key", 0L, (char_u *)"", OPT_LOCAL);
return cryptkey; return cryptkey;

6
src/undo.c
View File

@ -888,7 +888,7 @@ read_string_decrypt(buf, fd, len)
ptr = read_string(fd, len); ptr = read_string(fd, len);
#ifdef FEAT_CRYPT #ifdef FEAT_CRYPT
if (ptr != NULL || *buf->b_p_key != NUL) if (ptr != NULL && *buf->b_p_key != NUL)
crypt_decode(ptr, len); crypt_decode(ptr, len);
#endif #endif
return ptr; return ptr;
@ -909,7 +909,7 @@ serialize_header(fp, buf, hash)
/* If the buffer is encrypted then all text bytes following will be /* If the buffer is encrypted then all text bytes following will be
* encrypted. Numbers and other info is not crypted. */ * encrypted. Numbers and other info is not crypted. */
#ifdef FEAT_CRYPT #ifdef FEAT_CRYPT
if (*buf->b_p_key) if (*buf->b_p_key != NUL)
{ {
char_u *header; char_u *header;
int header_len; int header_len;
@ -1475,7 +1475,7 @@ u_write_undo(name, forceit, buf, hash)
if (serialize_header(fp, buf, hash) == FAIL) if (serialize_header(fp, buf, hash) == FAIL)
goto write_error; goto write_error;
#ifdef FEAT_CRYPT #ifdef FEAT_CRYPT
if (*buf->b_p_key) if (*buf->b_p_key != NUL)
do_crypt = TRUE; do_crypt = TRUE;
#endif #endif