From e012b81c471f05ef9c27a2dfb58056c59f2bd18f Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Nov 03 2017 16:31:08 +0000
Subject: Merge branch 'f27'


---

diff --git a/.gitignore b/.gitignore
index f362de2..caca372 100644
--- a/.gitignore
+++ b/.gitignore
@@ -134,3 +134,4 @@
 /vim-8.0-1238.tar.bz2
 /vim-8.0-1240.tar.bz2
 /vim-8.0-1241.tar.bz2
+/vim-8.0-1257.tar.bz2
diff --git a/sources b/sources
index b39ca2a..eb302ec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-1241.tar.bz2) = c3df065530cecd5b10384e00b0128b550ad3d40a496f5523cd91705af2c4d7122e3faa20c54f28e8af6cd0f2990873019c456044e103919d841674cc9cee3132
+SHA512 (vim-8.0-1257.tar.bz2) = bab4b48e0a80b251598aee3d4c872262167d82130c1ad529739f9c79dba38fa60857c909f740c9c13efd3402648438aa833f5410edfc2012b0e946d1dbf774b6
diff --git a/vim-8.0-bindsyntax.patch b/vim-8.0-bindsyntax.patch
deleted file mode 100644
index e9c5827..0000000
--- a/vim-8.0-bindsyntax.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up vim80/runtime/filetype.vim.bindsyntax vim80/runtime/filetype.vim
---- vim80/runtime/filetype.vim.bindsyntax	2017-03-30 14:35:27.226674642 +0200
-+++ vim80/runtime/filetype.vim	2017-03-30 14:43:01.743145007 +0200
-@@ -289,7 +289,7 @@ au BufNewFile,BufRead *.bst			setf bst
- 
- " BIND configuration
- " sudoedit uses namedXXXX.conf
--au BufNewFile,BufRead named*.conf,rndc*.conf	setf named
-+au BufNewFile,BufRead named*.conf,rndc*.conf,rndc*.key	setf named
- 
- " BIND zone
- au BufNewFile,BufRead named.root		setf bindzone
diff --git a/vim.spec b/vim.spec
index 10bd86e..d2ced63 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 1241
+%define patchlevel 1257
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -67,7 +67,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-8.0-bindsyntax.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python2-devel python3-devel ncurses-devel gettext perl-devel
@@ -227,7 +226,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch3014 -p1
 %patch3015 -p1
 %patch3016 -p1
-%patch3017 -p1
 
 %build
 cd src
@@ -773,6 +771,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Fri Nov 03 2017 Karsten Hopp <karsten@redhat.com> 8.0.1257-1
+- patchlevel 1257
+
 * Wed Nov 01 2017 Karsten Hopp <karsten@redhat.com> 8.0.1241-1
 - patchlevel 1241