From 029dcc1ccfbe68b56a3d88ded83fefa3aa710a83 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: Apr 13 2015 16:00:05 +0000
Subject: - patchlevel 698


---

diff --git a/README.patches b/README.patches
index 78b777c..a86bc5f 100644
--- a/README.patches
+++ b/README.patches
@@ -714,3 +714,9 @@ Individual patches for Vim 7.4:
   3392  7.4.690  memory access errors when changing indent in Ex mode
   4331  7.4.691  (after 7.4.689) can't build with MzScheme
   1645  7.4.692  defining SOLARIS for no good reason
+  2100  7.4.693  session file is not correct when there are multiple tab pages
+  1515  7.4.694  running tests changes the .viminfo file
+  2184  7.4.695  out-of-bounds read, dectected by Coverity
+  1809  7.4.696  not freeing memory when encountering an error
+  1887  7.4.697  the filename used for ":profile" must be given literally
+ 14611  7.4.698  various problems with locked and fixed lists and dictionaries
diff --git a/vim.spec b/vim.spec
index 56d445b..7b8ac92 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 692
+%define patchlevel 698
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -739,6 +739,12 @@ Patch689: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.689
 Patch690: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.690
 Patch691: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.691
 Patch692: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.692
+Patch693: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.693
+Patch694: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.694
+Patch695: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.695
+Patch696: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.696
+Patch697: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.697
+Patch698: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.698
 
 Patch1559: 7.4.559.rhpatched
 Patch3000: vim-7.4-syntax.patch
@@ -1581,6 +1587,12 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch690 -p0
 %patch691 -p0
 %patch692 -p0
+%patch693 -p0
+%patch694 -p0
+%patch695 -p0
+%patch696 -p0
+%patch697 -p0
+%patch698 -p0
 
 # install spell files
 %if %{withvimspell}
@@ -2098,6 +2110,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Mon Apr 13 2015 Karsten Hopp <karsten@redhat.com> 7.4.698-1
+- patchlevel 698
+
 * Fri Apr 10 2015 Karsten Hopp <karsten@redhat.com> 7.4.692-1
 - patchlevel 692