From 5e69122a6f451ba1d7f5ab51dc678d74911b1237 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Apr 01 2015 16:00:04 +0000 Subject: - patchlevel 688 --- diff --git a/README.patches b/README.patches index 6a380cc..e86c13d 100644 --- a/README.patches +++ b/README.patches @@ -708,3 +708,5 @@ Individual patches for Vim 7.4: 12068 7.4.684 using non-unique temp file names when running Vim in diff mode 1953 7.4.685 with illegal utf-8 chars old regexp engine may crash 3157 7.4.686 "zr" and "zm" do not take a count + 9372 7.4.687 there is no way to use a different Replace cursor in terminal + 1697 7.4.688 when "$" is in 'cpo' the popup menu isn't undrawn correctly diff --git a/vim.spec b/vim.spec index b7e84ba..fa070ac 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 686 +%define patchlevel 688 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -733,6 +733,8 @@ Patch683: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.683 Patch684: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.684 Patch685: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.685 Patch686: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.686 +Patch687: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.687 +Patch688: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.688 Patch1559: 7.4.559.rhpatched Patch3000: vim-7.4-syntax.patch @@ -1569,6 +1571,8 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch684 -p0 %patch685 -p0 %patch686 -p0 +%patch687 -p0 +%patch688 -p0 # install spell files %if %{withvimspell} @@ -2086,6 +2090,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/apps/* %changelog +* Wed Apr 01 2015 Karsten Hopp 7.4.688-1 +- patchlevel 688 + * Tue Mar 31 2015 Karsten Hopp 7.4.686-1 - patchlevel 686