diff --git a/.gitignore b/.gitignore index 275146f..794c7ba 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ vim-7.2.tar.bz2 /vim-7.4-1265.tar.bz2 /vim-7.4-1273.tar.bz2 /vim-7.4-1290.tar.bz2 +/vim-7.4-1293.tar.bz2 diff --git a/README.patches b/README.patches index 4071185..1fd4889 100644 --- a/README.patches +++ b/README.patches @@ -1,3 +1,29 @@ +commit e56bf15c163a921ce9e1c09c0d5b3a03efc63324 +Author: Bram Moolenaar +Date: Mon Feb 8 23:23:42 2016 +0100 + + patch 7.4.1293 + Problem: Sometimes a channel may hang waiting for a message that was + already discarded. (Ken Takata) + Solution: Store the ID of the message blocking on in the channel. + +commit 2fc83fcd1d6dfd4728a2ef70e2316f79203c7ee0 +Author: Bram Moolenaar +Date: Mon Feb 8 22:57:24 2016 +0100 + + patch 7.4.1292 + Problem: Some compilers complain about uninitialzed variable, even though + all possible cases are handled. (Dominique Pelle) + Solution: Add a default initialization. + +commit b92abad0c58de36d0b0afdcd4ec05261fa1fa84c +Author: Bram Moolenaar +Date: Mon Feb 8 22:37:24 2016 +0100 + + patch 7.4.1291 + Problem: On MS-Windows the channel test server doesn't quit. + Solution: Use return instead of break. (Ken Takata) + commit cbebd4879cc78e670d79b2c57dc33d7b911c962a Author: Bram Moolenaar Date: Sun Feb 7 23:02:56 2016 +0100 diff --git a/sources b/sources index c021b99..8530e0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2caf5311af1234914a9cd4dec766fe6b vim-7.4-1290.tar.bz2 +863ec304fbc9e5f69513f3cdfdd67c30 vim-7.4-1293.tar.bz2 diff --git a/vim.spec b/vim.spec index d508584..1c55ee4 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1290 +%define patchlevel 1293 %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 Feb 09 2016 Karsten Hopp 7.4.1293-1 +- patchlevel 1293 + * Mon Feb 08 2016 Karsten Hopp 7.4.1290-1 - patchlevel 1290