diff --git a/.gitignore b/.gitignore index 794c7ba..831b6dc 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ vim-7.2.tar.bz2 /vim-7.4-1273.tar.bz2 /vim-7.4-1290.tar.bz2 /vim-7.4-1293.tar.bz2 +/vim-7.4-1297.tar.bz2 diff --git a/README.patches b/README.patches index 1fd4889..a50e126 100644 --- a/README.patches +++ b/README.patches @@ -1,3 +1,36 @@ +commit a483326e3b04215b86fe9c582ac96bb9679f0812 +Author: Bram Moolenaar +Date: Tue Feb 9 23:33:25 2016 +0100 + + patch 7.4.1297 + Problem: On Mac test_channel leaves python instances running. + Solution: Use a small waittime to make ch_open() work. (Ozaki Kiichi) + +commit f068dcafcfe0c8018e5a559c50769ca1364bd9a5 +Author: Bram Moolenaar +Date: Tue Feb 9 21:24:46 2016 +0100 + + patch 7.4.1296 + Problem: Cursor changes column with up motion when the matchparen plugin + saves and restores the cursor position. (Martin Kunev) + Solution: Make sure curswant is updated before invoking the autocommand. + +commit 4d8747cdfc13843a5680dc8340fbeb6d32e7b626 +Author: Bram Moolenaar +Date: Tue Feb 9 20:39:26 2016 +0100 + + patch 7.4.1295 + Problem: string(job) doesn't work well on MS-Windows. + Solution: Use the process ID. (Yasuhiro Matsumoto) + +commit 7280140c08799f683ef31a6c1019e283c3dc13aa +Author: Bram Moolenaar +Date: Tue Feb 9 11:37:50 2016 +0100 + + patch 7.4.1294 + Problem: job_stop() only kills the started process. + Solution: Send the signal to the process group. (Olaf Dabrunz) + commit e56bf15c163a921ce9e1c09c0d5b3a03efc63324 Author: Bram Moolenaar Date: Mon Feb 8 23:23:42 2016 +0100 diff --git a/sources b/sources index 8530e0e..ccf20e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -863ec304fbc9e5f69513f3cdfdd67c30 vim-7.4-1293.tar.bz2 +cdc9ad8e0285bdc5ce7a5677d6af842a vim-7.4-1297.tar.bz2 diff --git a/vim.spec b/vim.spec index 1c55ee4..b858252 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1293 +%define patchlevel 1297 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -756,6 +756,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/apps/* %changelog +* Wed Feb 10 2016 Karsten Hopp 7.4.1297-1 +- patchlevel 1297 + * Tue Feb 09 2016 Karsten Hopp 7.4.1293-1 - patchlevel 1293