diff --git a/.gitignore b/.gitignore index 08cd42f..70dab68 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /vim-7.4-1842.tar.bz2 /vim-7.4-1868.tar.bz2 /vim-7.4-1988.tar.bz2 +/vim-7.4-1989.tar.bz2 diff --git a/README.patches b/README.patches index aacb9f9..7449fa7 100644 --- a/README.patches +++ b/README.patches @@ -1,3 +1,19 @@ +commit 550c699eb780b27b3875f6cdffa2eae471390908 +Merge: 26522e4 b33c7eb +Author: Karsten Hopp +Date: Tue Jul 5 12:56:13 2016 +0200 + + Merge branch 'master' of https://github.com/vim/vim + +commit b33c7eb5b813cb631b2b0ca5c4029e1788a09bde +Author: Bram Moolenaar +Date: Mon Jul 4 22:29:49 2016 +0200 + + patch 7.4.1989 + Problem: filter() and map() only accept a string argument. + Solution: Implement using a Funcref argument (Yasuhiro Matsumoto, Ken + Takata) + commit 26522e4eebc3a78a23eeb63fa5ee2d24a9a7f189 Merge: 1c582ef ab9c89b Author: Karsten Hopp diff --git a/sources b/sources index 43f2476..8359e50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2d27068fec425d9ddb71081ae7001897 vim-7.4-1988.tar.bz2 +356d6fcd657ac28e9e8d1c8398cfda30 vim-7.4-1989.tar.bz2 diff --git a/vim.spec b/vim.spec index bb33b45..89c8e4a 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1988 +%define patchlevel 1989 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -746,6 +746,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/apps/* %changelog +* Tue Jul 05 2016 Karsten Hopp 7.4.1989-1 +- patchlevel 1989 + * Mon Jul 04 2016 Karsten Hopp 7.4.1988-1 - patchlevel 1988