From ad99b5e30b7cf5de220ef8dc17b6081cffb3351b Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Aug 23 2017 08:37:15 +0000
Subject: Merge branch 'f25' into f26


---

diff --git a/.gitignore b/.gitignore
index 74987aa..f8df36e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -102,3 +102,4 @@
 /vim-8.0-946.tar.bz2
 /vim-8.0-956.tar.bz2
 /vim-8.0-983.tar.bz2
+/vim-8.0-987.tar.bz2
diff --git a/README.patches b/README.patches
index 46848da..21dd7c7 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,41 @@
+commit d2c45a1964ddb0d9ac16c9c985051fab41f37840
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Aug 22 22:29:00 2017 +0200
+
+    patch 8.0.0987: terminal: second byte of double-byte char wrong
+    
+    Problem:    terminal: second byte of double-byte char wrong
+    Solution:   Set the second byte to NUL only for utf-8 and non-multibyte.
+
+commit ec0e07a32484ab70f1c7668294c3d8d67f8aca82
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Aug 22 22:21:37 2017 +0200
+
+    patch 8.0.0986: terminal feature always requires multi-byte feature
+    
+    Problem:    Terminal feature always requires multi-byte feature.
+    Solution:   Remove #ifdef FEAT_MBYTE, disable terminal without multi-byte.
+
+commit 6d0826dfbba9880820d9ec221327e4250bbf6540
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Aug 22 22:12:17 2017 +0200
+
+    patch 8.0.0985: libvterm has its own idea of character width
+    
+    Problem:    Libvterm has its own idea of character width.
+    Solution:   Use the Vim functions for character width and composing to avoid a
+                mismatch. (idea by Yasuhiro Matsumoto)
+
+commit 5830232c021102e47a4e6fc81857604e4a031ddf
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Aug 22 20:33:53 2017 +0200
+
+    patch 8.0.0984: terminal blinking cursor not correct in the GUI
+    
+    Problem:    Terminal blinking cursor not correct in the GUI.
+    Solution:   Set blinkoff correctly.  Also make the cursor blink on MS-Windows
+                by default. (Ken Takata)
+
 commit 3f9a1ff141412e9e85f7dff47d02946cb9be9228
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Mon Aug 21 22:06:02 2017 +0200
diff --git a/sources b/sources
index 07e2787..2c0abca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-983.tar.bz2) = d153857fabcb05fabe4c74d50534bdcdabad6a5ce682423d772719e4d5f3a6590557d283bdc58e694fbcb5e95ddac36f73063e11fa27719dbcb168e13b2ad690
+SHA512 (vim-8.0-987.tar.bz2) = 4be2622af837ba7dfea5c69498bcfea5245b6bc260008822a0918cde3b0c0a3b3da3c376e3beb3fd35f051d805ee79a1a7586516acd8efa83d0be049896a7d3f
diff --git a/vim.spec b/vim.spec
index 40b931f..8c4c71c 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 983
+%define patchlevel 987
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -770,6 +770,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Wed Aug 23 2017 Karsten Hopp <karsten@redhat.com> 8.0.987-1
+- patchlevel 987
+
 * Tue Aug 22 2017 Karsten Hopp <karsten@redhat.com> 8.0.983-1
 - patchlevel 983