- patchlevel 1989

This commit is contained in:
Karsten Hopp 2016-07-05 12:56:32 +02:00
parent ed4a451a2b
commit f847a8ba9a
4 changed files with 22 additions and 2 deletions

1
.gitignore vendored
View File

@ -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

View File

@ -1,3 +1,19 @@
commit 550c699eb780b27b3875f6cdffa2eae471390908
Merge: 26522e4 b33c7eb
Author: Karsten Hopp <karsten@redhat.com>
Date: Tue Jul 5 12:56:13 2016 +0200
Merge branch 'master' of https://github.com/vim/vim
commit b33c7eb5b813cb631b2b0ca5c4029e1788a09bde
Author: Bram Moolenaar <Bram@vim.org>
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 <karsten@redhat.com>

View File

@ -1 +1 @@
2d27068fec425d9ddb71081ae7001897 vim-7.4-1988.tar.bz2
356d6fcd657ac28e9e8d1c8398cfda30 vim-7.4-1989.tar.bz2

View File

@ -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 <karsten@redhat.com> 7.4.1989-1
- patchlevel 1989
* Mon Jul 04 2016 Karsten Hopp <karsten@redhat.com> 7.4.1988-1
- patchlevel 1988