diff --git a/.gitignore b/.gitignore index 90660a7..c511fd7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /vim-7.4.tar.bz2 /vim-7.4-1786.tar.bz2 +/vim-7.4-1797.tar.bz2 diff --git a/README.patches b/README.patches index b9e5e24..7579012 100644 --- a/README.patches +++ b/README.patches @@ -1,3 +1,96 @@ +commit c61348e83fd4eed8b999fe5b7cdfb4caf90bf3fd +Author: Bram Moolenaar +Date: Thu Apr 28 22:20:03 2016 +0200 + + patch 7.4.1797 + Problem: Warning from Windows 64 bit compiler. + Solution: Change int to size_t. (Mike Williams) + +commit 283ee8b3a07b9da18f6c73f35cf465b83f96406a +Author: Bram Moolenaar +Date: Wed Apr 27 20:36:31 2016 +0200 + + patch 7.4.1796 + Problem: Colors are wrong on MS-Windows. (Christian Robinson) + Solution: Use existing RGB macro if it exists. (Ken Takata) + +commit 5487544fa5d46af9f8f98aa4f5c59074a6e0639a +Author: Bram Moolenaar +Date: Tue Apr 26 22:33:17 2016 +0200 + + patch 7.4.1795 + Problem: Compiler warning for redefining RGB. (John Marriott) + Solution: Rename it to TORGB. + +commit c285fe7c3ffdb3ec4eff20a1d1d5accfc80f1a86 +Author: Bram Moolenaar +Date: Tue Apr 26 21:51:48 2016 +0200 + + patch 7.4.1794 + Problem: Can't build on MS-Windows. + Solution: Add missing declaration. + +commit e8aee7dcf9b12becff86e8ce1783a86801c5f9f6 +Author: Bram Moolenaar +Date: Tue Apr 26 21:39:13 2016 +0200 + + patch 7.4.1793 + Problem: Some character classes may differ between systems. On OS/X the + regexp test fails. + Solution: Make this less dependent on the system. (idea by Kazunobu Kuriyama) + +commit ab3022196ea4f1496e79b8ee85996e31c45d02f1 +Author: Bram Moolenaar +Date: Tue Apr 26 20:59:29 2016 +0200 + + patch 7.4.1792 + Problem: Color name decoding is implemented several times. + Solution: Move it to term.c. (Christian Brabandt) + +commit 674127e1801fd02ff07dddf0dc3bf0d8cce68997 +Author: Bram Moolenaar +Date: Tue Apr 26 20:30:07 2016 +0200 + + patch 7.4.1791 + Problem: Channel could be garbage collected too early. + Solution: Don't free a channel or remove it from a job when it is still + useful. + +commit 6231cb8b5b208becf088531816027001acc754e5 +Author: Bram Moolenaar +Date: Tue Apr 26 19:42:42 2016 +0200 + + patch 7.4.1790 + Problem: Leading white space in a job command matters. (Andrew Stewart) + Solution: Skip leading white space. + +commit 437905c25d4cedfa16d0f87392e4a000d22362b7 +Author: Bram Moolenaar +Date: Tue Apr 26 19:01:05 2016 +0200 + + patch 7.4.1789 + Problem: Cannot use ch_read() in the close callback. + Solution: Do not discard the channel if there is readahead. Do not discard + readahead if there is a close callback. + +commit c7baa43fdb3f5b001ba3e6eb05bf6e199698eeea +Author: Bram Moolenaar +Date: Tue Apr 26 17:34:44 2016 +0200 + + patch 7.4.1788 + Problem: NSIS script is missing packages. + Solution: Add the missing directories. (Ken Takata) + +commit b2658a1ab02cd0ba848164f70c7c464fdc398162 +Author: Bram Moolenaar +Date: Tue Apr 26 17:16:24 2016 +0200 + + patch 7.4.1787 + Problem: When a job ends the close callback is invoked before other + callbacks. On Windows the close callback is not called. + Solution: First invoke out/err callbacks before the close callback. + Make the close callback work on Windows. + commit d10abe52019d10403eb559ea0a424bbd310b738f Author: Bram Moolenaar Date: Sun Apr 24 15:41:33 2016 +0200 diff --git a/sources b/sources index 0e18412..7bdc89c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -164f655af75349e551e06f7db16ec89d vim-7.4-1786.tar.bz2 +1796124213bc3504e93c1b047a0cee9d vim-7.4-1797.tar.bz2 diff --git a/vim.spec b/vim.spec index b683d1e..d33067e 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1786 +%define patchlevel 1797 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -21,7 +21,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} License: Vim Group: Applications/Editors Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -773,6 +773,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/apps/* %changelog +* Fri Apr 29 2016 Karsten Hopp 7.4.1797-1 +- patchlevel 1797 + * Tue Apr 26 2016 Karsten Hopp 7.4.1786-1 - patchlevel 1786