# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1450535404 -3600
# Node ID 8977b399cf5552a761c40a27630cbce209c6003e
# Parent  e562b66b7eab65612e00e516b6cdf21e4ba2cd3e
commit https://github.com/vim/vim/commit/4a8c2cfc56b9affc36934aa0f20d8cfd2b1511c8
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Dec 19 15:28:18 2015 +0100

    patch 7.4.979
    Problem:    When changing the crypt key the blocks read from disk are not
                decrypted.
    Solution:   Also call ml_decrypt_data() when mf_old_key is set. (Ken Takata)

diff --git a/src/memfile.c b/src/memfile.c
--- a/src/memfile.c
+++ b/src/memfile.c
@@ -1032,8 +1032,9 @@ mf_read(mfp, hp)
     }
 
 #ifdef FEAT_CRYPT
-    /* Decrypt if 'key' is set and this is a data block. */
-    if (*mfp->mf_buffer->b_p_key != NUL)
+    /* Decrypt if 'key' is set and this is a data block. And when changing the
+     * key. */
+    if (*mfp->mf_buffer->b_p_key != NUL || mfp->mf_old_key != NULL)
 	ml_decrypt_data(mfp, hp->bh_data, offset, size);
 #endif
 
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    979,
+/**/
     978,
 /**/
     977,