From e6a4bc7597f431888ec1b20b8f435216757e6b11 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Aug 18 2017 07:29:51 +0000
Subject: Merge branch 'f25' into f26


---

diff --git a/.gitignore b/.gitignore
index 99b8870..4a8cc87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,3 +100,4 @@
 /vim-8.0-896.tar.bz2
 /vim-8.0-938.tar.bz2
 /vim-8.0-946.tar.bz2
+/vim-8.0-956.tar.bz2
diff --git a/README.patches b/README.patches
index 4113354..fd13c5d 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,100 @@
+commit cfce71710b6a2e1fb7f7f27d2a359e4b926f3af9
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Aug 17 20:31:48 2017 +0200
+
+    patch 8.0.0956: scrolling in a terminal window has flicker
+    
+    Problem:    Scrolling in a terminal hwindow as flicker when the Normal
+                background differs from the terminal window background.
+    Solution:   Set the attribute to clear with.
+
+commit 82de3c2c036bc89c2d9bdea236e0a7f1208a5571
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Aug 17 17:35:36 2017 +0200
+
+    patch 8.0.0955: Test_existent_file() fails on some file systems
+    
+    Problem:    Test_existent_file() fails on some file systems.
+    Solution:   Run the test again with a sleep when the test fails without a
+                sleep. (James McCoy, closes #1984)
+
+commit bc906e445c77eb4fb5ef97465a45b46499bba111
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Aug 17 17:21:05 2017 +0200
+
+    patch 8.0.0954: /proc/self/exe might be a relative path
+    
+    Problem:    /proc/self/exe might be a relative path.
+    Solution:   Make the path a full path. (James McCoy, closes #1983)
+
+commit f5be7cd01642fafc4b7d68894eb60cca60c7a405
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Aug 17 16:55:13 2017 +0200
+
+    patch 8.0.0953: get "no write since last change" error in terminal window
+    
+    Problem:    Get "no write since last change" error in terminal window.
+    Solution:   Use another message when closing a terminal window. Make ":quit!"
+                also end the job.
+
+commit a83e3962ac0e4bbfef15a072ad9a7390fc255409
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Aug 17 14:39:07 2017 +0200
+
+    patch 8.0.0952: has('terminal') does not check existence of dll file
+    
+    Problem:    MS-Windows: has('terminal') does not check existence of dll file.
+    Solution:   Check if the winpty dll file can be loaded. (Ken Takata)
+
+commit 84ed4ad08486f85948d4fe10a47aa2e312699eb9
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Aug 17 11:33:42 2017 +0200
+
+    patch 8.0.0951: another wrong #ifdef
+    
+    Problem:    Another wrong #ifdef.
+    Solution:   Change TERMINAL to FEAT_TERMINAL. (closes #1981)
+
+commit ade59630c737026edfaeff2d76985b304a34afb5
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Aug 17 11:22:46 2017 +0200
+
+    patch 8.0.0950: MS-Windows: wrong #ifdef, compiler warnings
+    
+    Problem:    MS-Windows: wrong #ifdef, compiler warnings for signed/unsigned.
+    Solution:   Change variable type. Change TERMINAL to FEAT_TERMINAL.
+
+commit 9e13aa7729486d79a530ecae1a7a95d10da27d61
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Aug 16 23:14:08 2017 +0200
+
+    patch 8.0.0949: winpty.dll name is fixed
+    
+    Problem:    winpty.dll name is fixed.
+    Solution:   Add the 'winptydll' option. Make the default name depend on
+                whether it is a 32-bit or 64-bit build. (idea by Yasuhiro
+                Matsumoto, closes #1978)
+
+commit 989a70c590c2bd109eb362d3a0e48cb1427ae13d
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Aug 16 22:46:01 2017 +0200
+
+    patch 8.0.0948: crash if timer closes window while dragging status line
+    
+    Problem:    Crash if timer closes window while dragging status line.
+    Solution:   Check if the window still exists. (Yasuhiro Matsumoto, closes
+                #1979)
+
+commit 6fe15bbc87cb996912fe3c2c4068e356071ac516
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Aug 16 21:09:18 2017 +0200
+
+    patch 8.0.0947: entering terminal using C-O C-W C-W goes to Insert mode
+    
+    Problem:    When in Insert mode and using CTRL-O CTRL-W CTRL-W to move to a
+                termainal window, get in a weird Insert mode.
+    Solution:   Don't go to Insert mode in a terminal window. (closes #1977)
+
 commit a9f8ee05f46f2d6621a3719cd15150155d33eed4
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Mon Aug 14 23:40:45 2017 +0200
diff --git a/sources b/sources
index 5e86ce5..90441ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-946.tar.bz2) = 9e43a040f4fd858baaa2ffcdd8ea1dda6aa2bb8dfef8bf29d3be9ca443f1aa38fa381570ef7b8c3d0f2b8902b441d90cc12e2ac12ad7ee07deb5dc88effddab3
+SHA512 (vim-8.0-956.tar.bz2) = 71955a300de36a33fb7ab7db6948c33c981ad1fb145cb72852448f60955025161405e8bf7b73b2735ab31ea79472e5381363157e84b366c336fe908e8038c67b
diff --git a/vim.spec b/vim.spec
index 9027972..2d93bd6 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 946
+%define patchlevel 956
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -770,6 +770,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Fri Aug 18 2017 Karsten Hopp <karsten@redhat.com> 8.0.956-1
+- patchlevel 956
+
 * Tue Aug 15 2017 Karsten Hopp <karsten@redhat.com> 8.0.946-1
 - patchlevel 946