From 826d6345759630447fc9d22d40a8e8f110c22d54 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Sep 14 2017 07:22:38 +0000
Subject: Merge branch 'f25' into f26


---

diff --git a/.gitignore b/.gitignore
index 699a710..3b02b33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -113,3 +113,4 @@
 /vim-8.0-1092.tar.bz2
 /vim-8.0-1097.tar.bz2
 /vim-8.0-1098.tar.bz2
+/vim-8.0-1102.tar.bz2
diff --git a/README.patches b/README.patches
index 09a165e..a908957 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,44 @@
+commit c71053c61180ed1ad0c98ba6063b769757832932
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Sep 14 00:00:44 2017 +0200
+
+    patch 8.0.1102: terminal window does not use Normal colors
+    
+    Problem:    Terminal window does not use Normal colors.
+    Solution:   For the GUI and when 'termguicolors' is enabled, use the actual
+                foreground and background colors for the terminal.  (Yasuhiro
+                Matsumoto, closes #2067)
+                Use the "Terminal" highlight group if defined.
+
+commit 71eeb74a608ddae2b52fb43766616672d0cdda18
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Sep 13 22:18:01 2017 +0200
+
+    patch 8.0.1101: channel write fails if writing to log fails
+    
+    Problem:    Channel write fails if writing to log fails.
+    Solution:   Ignore return value of fwrite(). (Ozaki Kiichi, closes #2081)
+
+commit 072412ed45aa20a67aaa7e387d7f6bf59c7d3fbe
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Sep 13 22:11:35 2017 +0200
+
+    patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
+    
+    Problem:    Stuck in redraw loop when 'lazyredraw' is set.
+    Solution:   Don't loop on update_screen() when not redrawing. (Yasuhiro
+                Matsumoto, closes #2082)
+
+commit 518d6996998b35ccbc408b1b323f8869c0c1b4d8
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Sep 13 22:09:58 2017 +0200
+
+    patch 8.0.1099: warnings for GDK calls
+    
+    Problem:    Warnings for GDK calls.
+    Solution:   Use other calls for GTK 3 and fix a few problems. (Kazunobu
+                Kuriyama)
+
 commit b984b80cd835a483bdca1928bc50eb09b071f373
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Tue Sep 12 22:59:58 2017 +0200
diff --git a/sources b/sources
index faf72df..0a86080 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-1098.tar.bz2) = 0642a8690bea2719d94b02b1fb7685fe93673363da15529ebeae6fd653eac8374a883e43f2eb541d5fdde02c796a9f6b3c7fff74abd5c6e23899b2422a2c6308
+SHA512 (vim-8.0-1102.tar.bz2) = f40f423e82d376bbd035cea788964feddc6d9959abdc96d1c9e6fbbdfc6bf19473b96ac236d5af9fc376fcbcb9a38da35626c04001d5f69a8bdeda23e7d0b77f
diff --git a/vim.spec b/vim.spec
index 55fd341..ccae9dd 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 1098
+%define patchlevel 1102
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -774,6 +774,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Thu Sep 14 2017 Karsten Hopp <karsten@redhat.com> 8.0.1102-1
+- patchlevel 1102
+
 * Wed Sep 13 2017 Karsten Hopp <karsten@redhat.com> 8.0.1098-1
 - editing vim-update.sh - check updates for newer releases and create update
 - patchlevel 1098