From 3dba78f1db3ecdc6ff305a5eec71b375722704a1 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Sep 19 2017 07:07:45 +0000
Subject: Merge branch 'f26' into f27


---

diff --git a/.gitignore b/.gitignore
index 9be6b4f..f095869 100644
--- a/.gitignore
+++ b/.gitignore
@@ -115,3 +115,4 @@
 /vim-8.0-1098.tar.bz2
 /vim-8.0-1102.tar.bz2
 /vim-8.0-1123.tar.bz2
+/vim-8.0-1127.tar.bz2
diff --git a/README.patches b/README.patches
index 29e9a0f..740d9f1 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,41 @@
+commit a8e93d63e308020ee06eb5782e766941ac417a5a
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Sep 18 21:50:47 2017 +0200
+
+    patch 8.0.1127: Test_peek_and_get_char fails on 32 bit system
+    
+    Problem:    Test_peek_and_get_char fails on 32 bit system. (Eliminate
+                Riesebieter)
+    Solution:   Avoid an integer overflow. (James McCoy, closes #2116)
+
+commit 71b29640669872b0209985fc5a3b447de62a4cf0
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Sep 18 21:24:56 2017 +0200
+
+    patch 8.0.1126: endless resize when terminal showing in two buffers
+    
+    Problem:    Endless resize when terminal showing in two buffers. (Hirohito
+                Higashi)
+    Solution:   Set a flag to prevent resizing the window.
+
+commit d326ad6e93604222c64bae51f47521fe9114d1ea
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Sep 18 20:31:41 2017 +0200
+
+    patch 8.0.1125: wrong window height when splitting window with window toolbar
+    
+    Problem:    Wrong window height when splitting window with window toolbar.
+    Solution:   Add or subtract the window toolbar height.
+
+commit f16c71b66927a28196b25a42795d083784ab1b9a
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Sep 18 20:01:02 2017 +0200
+
+    patch 8.0.1124: use of MZSCHEME_VER is unclear
+    
+    Problem:    Use of MZSCHEME_VER is unclear.
+    Solution:   Add a comment. (Ken Takata)
+
 commit 1b9645de3c05f37b5c30e78f999351b0cf486ade
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Sun Sep 17 23:03:31 2017 +0200
diff --git a/sources b/sources
index 0676a80..3fff1c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-1123.tar.bz2) = 231b6fb6cfab811a05dff7fee4bf07c27dabce9144178918c574f07fe53c8c0b3a8b2efecb0de2ee7700dc8ca423e4d78575bec59817ded49489c9d3434c0c16
+SHA512 (vim-8.0-1127.tar.bz2) = 9246a25df0c368423d876b1348fb08e1305e9d86042f9e9e23417314a611ac718d2714fa0af262e1d095c3bbb055fdd9095ca720f8ccb0ca537c6fc1dfccc29d
diff --git a/vim.spec b/vim.spec
index fa561b2..a5e160c 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 1123
+%define patchlevel 1127
 %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
+* Tue Sep 19 2017 Karsten Hopp <karsten@redhat.com> 8.0.1127-1
+- patchlevel 1127
+
 * Tue Sep 19 2017 Zdenek Dohnal <zdohnal@redhat.com> - 8.0.1123-2
 - vim-update.sh - fixing bug with submiting update (update got submitted for previous version)