From 1a3f423bee3dd46084440909b4cee6193bd8466e Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Feb 21 2017 14:48:55 +0000 Subject: Merge branch 'f25' --- diff --git a/.gitignore b/.gitignore index 799d91c..ab704f8 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /vim-8.0-324.tar.bz2 /vim-8.0-329.tar.bz2 /vim-8.0-342.tar.bz2 +/vim-8.0-344.tar.bz2 diff --git a/README.patches b/README.patches index e17e67c..1a2e466 100644 --- a/README.patches +++ b/README.patches @@ -1,3 +1,22 @@ +commit 49439c4cdf7d2822255f292adda4226656fe144d +Author: Bram Moolenaar +Date: Mon Feb 20 23:07:05 2017 +0100 + + patch 8.0.0344: unlet command leaks memory + + Problem: Unlet command leaks memory. (Nikolai Pavlov) + Solution: Free the memory on error. (closes #1497) + +commit e7877fe0de1426f8de9ada825e4f7b64810c7dbc +Author: Bram Moolenaar +Date: Mon Feb 20 22:35:33 2017 +0100 + + patch 8.0.0343: b:changedtick can be unlocked + + Problem: b:changedtick can be unlocked, even though it has no effect. + (Nikolai Pavlov) + Solution: Add a check and error E940. (closes #1496) + commit 673911457d6745b6b779eb769c2f41965592d12c Author: Bram Moolenaar Date: Sun Feb 19 21:07:04 2017 +0100 diff --git a/sources b/sources index f4c84eb..e31599c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.0-342.tar.bz2) = 3f8807c7a53d93dc52cb4042a5ed94df78a96421ec5f7345f11274ab2a11f01a31c04cd4a788af3807ea20edfaf11932cefc83ada7d080f07bedf9915876001b +SHA512 (vim-8.0-344.tar.bz2) = 6216bcbaf5a7dbdaacf1fbe0c264ce2c109bfe7da32ce0612e2121bcf143128d7681cc53decdc81de43bb66485b639cada339cda519c0d398803a9b2dfe244fc diff --git a/vim.spec b/vim.spec index d4b459e..ead4bc7 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 342 +%define patchlevel 344 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -765,6 +765,9 @@ rm -rf %{buildroot} %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Feb 21 2017 Karsten Hopp 8.0.344-1 +- patchlevel 344 + * Mon Feb 20 2017 Karsten Hopp 8.0.342-1 - patchlevel 342