Merge remote-tracking branch 'vim/master'

Author: splhack

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
 

src/testdir/test_cdo.in

@@ -2,6 +2,7 @@ Tests for the :cdo, :cfdo, :ldo and :lfdo commands
 
 STARTTEST
 :so small.vim
+:lang mess C
 :if !has('quickfix') | e! test.ok | wq! test.out | endif
 
 :call writefile(["Line1", "Line2", "Line3"], 'Xtestfile1')

src/version.c

@@ -756,6 +756,10 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    979,
+/**/
+    978,
 /**/
     977,
 /**/