Mercurial > vim

comparison src/fileio.c @ 6130:86fb698a38d5 v7.4.403

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.403 Problem: Valgrind reports errors when running test 72. (Dominique Pelle) Solution: Reset the local 'cryptmethod' option before storing the seed. Set the seed in the memfile even when there is no block0 yet.
author Bram Moolenaar <bram@vim.org>
date Wed, 13 Aug 2014 21:58:28 +0200
parents 18ac55444b37
children 67edf731a240
comparison
equal deleted inserted replaced
6129:6c3ed76a6e89 6130:86fb698a38d5
2942 { 2942 {
2943 /* Mark the buffer as read-only until the decryption has taken place. 2943 /* Mark the buffer as read-only until the decryption has taken place.
2944 * Avoids accidentally overwriting the file with garbage. */ 2944 * Avoids accidentally overwriting the file with garbage. */
2945 curbuf->b_p_ro = TRUE; 2945 curbuf->b_p_ro = TRUE;
2946 2946
2947 /* Set the cryptmethod local to the buffer. */
2947 crypt_set_cm_option(curbuf, method); 2948 crypt_set_cm_option(curbuf, method);
2948 if (cryptkey == NULL && !*did_ask) 2949 if (cryptkey == NULL && !*did_ask)
2949 { 2950 {
2950 if (*curbuf->b_p_key) 2951 if (*curbuf->b_p_key)
2951 cryptkey = curbuf->b_p_key; 2952 cryptkey = curbuf->b_p_key;