diff --git a/.gitignore b/.gitignore index f0653fb..faeabea 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ vim-7.2.tar.bz2 /vim-7.4-970.tar.bz2 /vim-7.4-972.tar.bz2 /vim-7.4-977.tar.bz2 +/vim-7.4-979.tar.bz2 diff --git a/README.patches b/README.patches index 6c5b86a..6395532 100644 --- a/README.patches +++ b/README.patches @@ -1,3 +1,20 @@ +commit 4a8c2cfc56b9affc36934aa0f20d8cfd2b1511c8 +Author: Bram Moolenaar +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) + +commit c42b9c670ea621d4dac0f216e011a6db576c5136 +Author: Bram Moolenaar +Date: Sat Dec 19 15:15:54 2015 +0100 + + patch 7.4.978 + Problem: test_cdo fails when using another language than English. + Solution: Set the language to C. (Dominique Pelle) + commit 9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0 Author: Bram Moolenaar Date: Thu Dec 17 21:14:58 2015 +0100 diff --git a/sources b/sources index 8238224..d226763 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7a8ae8ba21f836b180360e144a592111 vim-7.4-977.tar.bz2 +6a7f2abd197a1e9c8c4ee3eb7951f365 vim-7.4-979.tar.bz2 diff --git a/vim.spec b/vim.spec index cc7900a..979a703 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 977 +%define patchlevel 979 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -756,6 +756,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/apps/* %changelog +* Sun Dec 20 2015 Karsten Hopp 7.4.979-1 +- patchlevel 979 + * Fri Dec 18 2015 Karsten Hopp 7.4.977-1 - patchlevel 977