karsten pushed to vim (master). "- patchlevel 686"

[notifications at fedoraproject.org]

From c04268a6aa07f237f4e36cff8199f1e4d3c3af00 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten at redhat.com>
Date: Tue, 31 Mar 2015 18:00:05 +0200
Subject: - patchlevel 686


diff --git a/README.patches b/README.patches
index 19dc2ac..6a380cc 100644
--- a/README.patches
+++ b/README.patches
@@ -705,3 +705,6 @@ Individual patches for Vim 7.4:
   2327  7.4.681  MS-Windows: with minimized Vim window height is incorrect
   2603  7.4.682  search and match highlighting replace cursorline highlighting
   2222  7.4.683  typo in the vimtutor command
+ 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
diff --git a/vim.spec b/vim.spec
index f4c6e36..b7e84ba 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 683
+%define patchlevel 686
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -730,6 +730,9 @@ Patch680: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.680
 Patch681: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.681
 Patch682: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.682
 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
 
 Patch1559: 7.4.559.rhpatched
 Patch3000: vim-7.4-syntax.patch
@@ -1563,6 +1566,9 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch681 -p0
 %patch682 -p0
 %patch683 -p0
+%patch684 -p0
+%patch685 -p0
+%patch686 -p0
 
 # install spell files
 %if %{withvimspell}
@@ -2080,6 +2086,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Mar 31 2015 Karsten Hopp <karsten at redhat.com> 7.4.686-1
+- patchlevel 686
+
 * Thu Mar 26 2015 Karsten Hopp <karsten at redhat.com> 7.4.683-1
 - patchlevel 683
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/vim.git/commit/?h=master&id=c04268a6aa07f237f4e36cff8199f1e4d3c3af00