diff --git a/.gitignore b/.gitignore index a537eff..ad29c44 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ vim-7.2.tar.bz2 /vim-7.4-1293.tar.bz2 /vim-7.4-1297.tar.bz2 /vim-7.4-1301.tar.bz2 +/vim-7.4-1304.tar.bz2 diff --git a/README.patches b/README.patches index 931d561..7118f36 100644 --- a/README.patches +++ b/README.patches @@ -1,3 +1,28 @@ +commit 7823a3bd2eed6ff9e544d201de96710bd5344aaf +Author: Bram Moolenaar +Date: Thu Feb 11 21:08:32 2016 +0100 + + patch 7.4.1304 + Problem: Function names are difficult to read. + Solution: Rename jsonencode to json_encode, jsondecode to json_decode, + jsencode to js_encode and jsdecode to js_decode. + +commit b6a4fee37ebbb0c76f2fbda7d06cbf48a3a07e8d +Author: Bram Moolenaar +Date: Thu Feb 11 20:48:34 2016 +0100 + + patch 7.4.1303 + Problem: A Funcref is not accepted as a callback. + Solution: Make a Funcref work. (Damien) + +commit 6119e6156e024d9047bbfeb7cdfdae259f9e1b92 +Author: Bram Moolenaar +Date: Thu Feb 11 12:48:36 2016 +0100 + + patch 7.4.1302 + Problem: Typo in struct field name. (Ken Takata) + Solution: Rename jf_pi to jv_pi. + commit 39b21272d521512b6ecac6cc0f310944f21b7443 Author: Bram Moolenaar Date: Wed Feb 10 23:28:21 2016 +0100 diff --git a/sources b/sources index 2264669..35c66da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -610513a0ab822dd14836073b3b4382cf vim-7.4-1301.tar.bz2 +bd102d635dc37ea5d118a1482bb46d74 vim-7.4-1304.tar.bz2 diff --git a/vim.spec b/vim.spec index 0dd8bf6..3837f99 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1301 +%define patchlevel 1304 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -756,6 +756,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/apps/* %changelog +* Fri Feb 12 2016 Karsten Hopp 7.4.1304-1 +- patchlevel 1304 + * Thu Feb 11 2016 Karsten Hopp 7.4.1301-1 - patchlevel 1301