From 603d5274dcbc80b26faa2d16fff008ae76ce88a8 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Sep 08 2017 08:26:21 +0000
Subject: Merge branch 'f25' into f26


---

diff --git a/.gitignore b/.gitignore
index a7d4cb9..ec2109d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -109,3 +109,4 @@
 /vim-8.0-1056.tar.bz2
 /vim-8.0-1064.tar.bz2
 /vim-8.0-1067.tar.bz2
+/vim-8.0-1071.tar.bz2
diff --git a/README.patches b/README.patches
index 94988a0..6f9011e 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,42 @@
+commit c6da01a5b8efe9ca4931074c0cf2189d357707a2
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Sep 7 22:37:36 2017 +0200
+
+    patch 8.0.1071: putty-color and cygwin-color are not recognized
+    
+    Problem:    $TERM names starting with "putty" and "cygwin" are likely to have
+                a dark background, but are not recognized.
+    Solution:   Only check the first few characters of $TERM to match "putty" or
+                "cygwin". (Christian Brabandt)
+
+commit 75a60f74ce1000b0ffed2e6a203a05f3cd160c6a
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Sep 7 22:24:41 2017 +0200
+
+    patch 8.0.1070: terminal test is flaky on Mac
+    
+    Problem:    Terminal test is flaky on Mac.
+    Solution:   Add Test_terminal_noblock() to list of flaky tests.
+
+commit 37b53270e1a65d1d56187a3d68439e666e8b75fd
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Sep 7 20:18:40 2017 +0200
+
+    patch 8.0.1069: still get CTRL-X sometimes
+    
+    Problem:    Still get CTRL-X sometimes for t_RS request.
+    Solution:   Also skip 0x18 after a key code response.
+
+commit 618d6d277e7b64ea03fcefdd75d673e8973b46c4
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Sep 7 12:59:25 2017 +0200
+
+    patch 8.0.1068: vandyke SecureCRT terminal can't handle cursor mode request
+    
+    Problem:    Vandyke SecureCRT terminal can't handle cursor mode request.
+                (Steven Hartland)
+    Solution:   Fix pointer computation. (closes #2008)
+
 commit e723c42836d971180d1bf9f98916966c5543fff1
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Wed Sep 6 23:40:10 2017 +0200
diff --git a/sources b/sources
index 60aa284..5da42b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-1067.tar.bz2) = fed2d91cf470205810c708e24673bdf597d0a01a108760c667e7915bafc5f5283592774ab884246ec801abb3cb17ee8479203742dbf188f9ce9bd0576b741ca2
+SHA512 (vim-8.0-1071.tar.bz2) = 3b4e32b41e1744367b67a495ddeeaba5c6151f6d321fe102df3167481487c9f88d705c0f04af36e37c50785a8d070bfcc912da101bb908be87b2d4589fd0d14d
diff --git a/vim.spec b/vim.spec
index ade62cf..84d406b 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 1067
+%define patchlevel 1071
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -24,7 +24,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: Vim
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
@@ -770,6 +770,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Fri Sep 08 2017 Karsten Hopp <karsten@redhat.com> 8.0.1071-1
+- patchlevel 1071
+
 * Fri Sep 08 2017 Zdenek Dohnal <zdohnal@redhat.com> - 8.0.1067-2
 - editing vim-update.sh to do whole update automatically