From 2904a9bb7d567054bd4e5bd97375a7d6eb843802 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Aug 11 2017 11:33:45 +0000
Subject: Merge branch 'f25' into f26


---

diff --git a/.gitignore b/.gitignore
index 23b537a..07f573f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -97,3 +97,4 @@
 /vim-8.0-891.tar.bz2
 /vim-8.0-893.tar.bz2
 /vim-8.0-895.tar.bz2
+/vim-8.0-896.tar.bz2
diff --git a/README.patches b/README.patches
index cfb1e82..6edf2d6 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,14 @@
+commit dd693ce28b158ff573129ee30fe5b886544a03c2
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Aug 10 23:15:19 2017 +0200
+
+    patch 8.0.0896: cannot close a terminal window when the job ends
+    
+    Problem:    Cannot automaticlaly close a terminal window when the job ends.
+    Solution:   Add the ++close argument to :term.  Add the term_finish option to
+                term_start(). (Yasuhiro  Matsumoto, closes #1950)  Also add
+                ++open.
+
 commit 8ab3c1dc6bf70021f89e6e614b202606863bc168
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Wed Aug 9 22:24:52 2017 +0200
diff --git a/sources b/sources
index 0067351..d1237ec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-895.tar.bz2) = 881e073ef8644adb59393bbb4515089100013e954fc0be4c468f20d056e86e4740fb63c2d7c3edda231d0ba8d0ad7dc50f46f3a7e99079996dd817511bd4f7e8
+SHA512 (vim-8.0-896.tar.bz2) = b984c37e6ecf8b56bb8a340b74f2b6d729ba7e0cc1843d9fe9c6cd21cfaf5d8a23c16fabb38309c3a32412cc1883755d75924a814077416f371afea09fc5faf6
diff --git a/vim.spec b/vim.spec
index 5264167..356ab77 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 895
+%define patchlevel 896
 %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 11 2017 Karsten Hopp <karsten@redhat.com> 8.0.896-1
+- patchlevel 896
+
 * Thu Aug 10 2017 Karsten Hopp <karsten@redhat.com> 8.0.895-1
 - patchlevel 895