From 2f544da6f7594cd6734c3cb2fa68b384e4ab7b60 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Sep 20 2017 10:28:09 +0000
Subject: Merge branch 'f26' into f27


---

diff --git a/.gitignore b/.gitignore
index f095869..1595e5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -116,3 +116,4 @@
 /vim-8.0-1102.tar.bz2
 /vim-8.0-1123.tar.bz2
 /vim-8.0-1127.tar.bz2
+/vim-8.0-1129.tar.bz2
diff --git a/README.patches b/README.patches
index 740d9f1..777318c 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,34 @@
+commit 2e6ab18729a634f3223a92be318e98e87b572a7b
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Sep 20 10:03:07 2017 +0200
+
+    Add back terminal.c
+
+commit a5a2be26febee62da480265ed9a52f782d5b4388
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Sep 19 22:08:04 2017 +0200
+
+    patch 8.0.1129: window toolbar missing a part of the patch
+    
+    Problem:    Window toolbar missing a part of the patch.
+    Solution:   Add change in vim.h.
+
+commit 37c64c78fd87e086b5a945ad7032787c274e2dcb
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Sep 19 22:06:03 2017 +0200
+
+    Update runtime files.
+
+commit e22bbf65088a01b465918919782c19eb291f9cf0
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Sep 19 20:47:16 2017 +0200
+
+    patch 8.0.1128: old xterm sends CTRL-X in response to t_RS
+    
+    Problem:    Old xterm sends CTRL-X in response to t_RS.
+    Solution:   Only send t_RS for xterm 279 and later.  Remove the workaround to
+                ignore CTRL-X.
+
 commit a8e93d63e308020ee06eb5782e766941ac417a5a
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Mon Sep 18 21:50:47 2017 +0200
diff --git a/sources b/sources
index 3fff1c8..c146854 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-1127.tar.bz2) = 9246a25df0c368423d876b1348fb08e1305e9d86042f9e9e23417314a611ac718d2714fa0af262e1d095c3bbb055fdd9095ca720f8ccb0ca537c6fc1dfccc29d
+SHA512 (vim-8.0-1129.tar.bz2) = 61f239aec350f90583a8fd9d68cce2d4467cb605b184add4d6993488b9b18e8bb00a0ddb06ce280c7b5f669a02d49960ed684732866dfc05916a18f125506b14
diff --git a/vim.spec b/vim.spec
index 3baa2d6..658ac6b 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 1127
+%define patchlevel 1129
 %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
@@ -774,6 +774,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Wed Sep 20 2017 Karsten Hopp <karsten@redhat.com> 8.0.1129-1
+- patchlevel 1129
+
 * Wed Sep 20 2017 Zdenek Dohnal <zdohnal@redhat.com> - 8.0.1127-2
 - vim-update.sh - update script tried to push for previous version