From e713b3ad867ebb97176fa294146566a63eacdf15 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Aug 01 2017 11:57:12 +0000
Subject: Merge branch 'f25' into f26


---

diff --git a/.gitignore b/.gitignore
index b043924..19711b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -91,3 +91,4 @@
 /vim-8.0-738.tar.bz2
 /vim-8.0-739.tar.bz2
 /vim-8.0-823.tar.bz2
+/vim-8.0-826.tar.bz2
diff --git a/README.patches b/README.patches
index 05625e7..61a6913 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,33 @@
+commit 662d93866636995c0564d974e554f96e76fb2dd9
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Jul 31 22:56:24 2017 +0200
+
+    patch 8.0.0826: cannot use text objects in Terminal mode
+    
+    Problem:    Cannot use text objects in Terminal mode.
+    Solution:   Check for pending operator and Visual mode first. (Yasuhiro
+                Matsumoto, closes #1906)
+
+commit 3633cf5201e914cc802fd2f813fa87bc959ffaec
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Jul 31 22:29:35 2017 +0200
+
+    patch 8.0.0825: not easy to see that a window is a terminal window
+    
+    Problem:    Not easy to see that a window is a terminal window.
+    Solution:   Add StatusLineTerm highlighting.
+
+commit 392d1bfa5e14b9534af322003723ebd57cedcc64
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Jul 31 21:18:58 2017 +0200
+
+    patch 8.0.0824: in Terminal mode the cursor and screen gets redrawn
+    
+    Problem:    In Terminal mode the cursor and screen gets redrawn when the job
+                produces output.
+    Solution:   Check for tl_terminal_mode. (partly by Yasuhiro Matsumoto, closes
+                #1904)
+
 commit c9456cec0cfe956e083891187b791343e732207b
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Sun Jul 30 21:46:04 2017 +0200
diff --git a/sources b/sources
index 6476f72..f650b62 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-823.tar.bz2) = 5f22dee141aad25288f2868a56da503dffb3a813d1b874285a72c36a4c6eb426e1ca3e375fc988cd2cbbb7ec684f79fd357b20bb05077227a2f481cf28c120fa
+SHA512 (vim-8.0-826.tar.bz2) = 4e6b7d1461edb2fd1dd039c5f11b583f764ae3f29e53522eeb33fba4de7d59d6372cb1b387d7e24a8f1f3eeaaa970755f75b789cb648197e7568636aaabe0a44
diff --git a/vim.spec b/vim.spec
index cf35838..b80b7d5 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 823
+%define patchlevel 826
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -770,6 +770,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Tue Aug 01 2017 Karsten Hopp <karsten@redhat.com> 8.0.826-1
+- patchlevel 826
+
 * Mon Jul 31 2017 Karsten Hopp <karsten@redhat.com> 8.0.823-1
 - patchlevel 823