diff --git a/.gitignore b/.gitignore index d0dcc61..b06f05f 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ vim-7.2.tar.bz2 /vim-7.4-1101.tar.bz2 /vim-7.4-1112.tar.bz2 /vim-7.4-1129.tar.bz2 +/vim-7.4-1131.tar.bz2 diff --git a/README.patches b/README.patches index 58cdeb2..5d2ea7e 100644 --- a/README.patches +++ b/README.patches @@ -1,3 +1,21 @@ +commit b20e334859334be35de4b295023a2b49bdabbfa9 +Author: Bram Moolenaar +Date: Mon Jan 18 23:29:01 2016 +0100 + + patch 7.4.1131 + Problem: New lines in the viminfo file are dropped. + Solution: Copy lines starting with "|". Fix that when using :rviminfo in a + function global variables were restored as function-local + variables. + +commit 61ff4dd6a4d47bd32383fe28087be2b37dec53f4 +Author: Bram Moolenaar +Date: Mon Jan 18 20:30:17 2016 +0100 + + patch 7.4.1130 + Problem: Memory leak in :vimgrep. + Solution: Call FreeWild(). (Yegappan Lakshmanan) + commit 77324fc9d3206a12f5ae39da1574be3ee1273591 Author: Bram Moolenaar Date: Sun Jan 17 22:37:03 2016 +0100 diff --git a/sources b/sources index ea58d7b..0e1e768 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dac268458cb8378a0dbd80f8ddbc8166 vim-7.4-1129.tar.bz2 +dc2f2492ef061ac0046cb4eb593a4ce5 vim-7.4-1131.tar.bz2 diff --git a/vim.spec b/vim.spec index eede806..68a0f33 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1129 +%define patchlevel 1131 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -756,6 +756,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/apps/* %changelog +* Tue Jan 19 2016 Karsten Hopp 7.4.1131-1 +- patchlevel 1131 + * Mon Jan 18 2016 Karsten Hopp 7.4.1129-1 - patchlevel 1129