From bfbcae1534e332ed2794eac9665d43542bc3267b Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Jan 11 2017 18:38:30 +0000
Subject: - patchlevel 170


---

diff --git a/.gitignore b/.gitignore
index aa4cf02..95552fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /vim-8.0-134.tar.bz2
 /vim-8.0-142.tar.bz2
 /vim-8.0-160.tar.bz2
+/vim-8.0-170.tar.bz2
diff --git a/sources b/sources
index 785abb7..07665c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-160.tar.bz2) = d48bb23a970f938d45329905e6eaae66e9356bef01eccfd54a7445d734147607c74e06b91f141e4ea2f1429e2d5f64f6e8756095ebcc04c73cfe818db0581535
+SHA512 (vim-8.0-170.tar.bz2) = 25000a127856935601cfd401838b797df0d9fef6fa0ec6e6037ba298cc67db66b2c2a6258ec368fda2c9730c54b219437f02214abcb21315923361de8987ee06
diff --git a/vim-ftbfs-ccline.patch b/vim-ftbfs-ccline.patch
deleted file mode 100644
index f29537e..0000000
--- a/vim-ftbfs-ccline.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up vim-upstream/src/ex_getln.c.ftbfs-ccline vim-upstream/src/ex_getln.c
---- vim-upstream/src/ex_getln.c.ftbfs-ccline	2017-01-09 10:05:09.306922726 +0100
-+++ vim-upstream/src/ex_getln.c	2017-01-09 10:06:31.846267643 +0100
-@@ -212,7 +212,7 @@ getcmdline(
- #endif
-     expand_T	xpc;
-     long	*b_im_ptr = NULL;
--#if defined(FEAT_WILDMENU) || defined(FEAT_EVAL) || defined(FEAT_SEARCH_EXTRA)
-+#if defined(FEAT_WILDMENU) || defined(FEAT_EVAL) || defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CMDWIN)
-     /* Everything that may work recursively should save and restore the
-      * current command line in save_ccline.  That includes update_screen(), a
-      * custom status line may invoke ":normal". */
diff --git a/vim.spec b/vim.spec
index 469a3b5..9297fc1 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 160
+%define patchlevel 170
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -65,7 +65,6 @@ Patch3013: vim-7.4-globalsyntax.patch
 Patch3014: vim-7.4-releasestring-1318991.patch
 Patch3015: vim-8.0-rhbz1365258.patch
 Patch3016: vim-8.0-copy-paste.patch
-Patch3017: vim-ftbfs-ccline.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python-devel python3-devel ncurses-devel gettext perl-devel
@@ -221,7 +220,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch3014 -p1
 %patch3015 -p1
 %patch3016 -p1
-%patch3017 -p1
 
 %build
 cp -f %{SOURCE6} .
@@ -760,6 +758,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Wed Jan 11 2017 Karsten Hopp <karsten@redhat.com> 8.0.170-1
+- patchlevel 170
+
 * Mon Jan 09 2017 Karsten Hopp <karsten@redhat.com> 8.0.160-1
 - patchlevel 160