From a3c313004218cdf7f2f13c7040953c9c17c81ccf Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Aug 08 2017 10:01:54 +0000
Subject: Merge branch 'f25' into f26


---

diff --git a/.gitignore b/.gitignore
index c835cd7..ae9a1a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -94,3 +94,4 @@
 /vim-8.0-826.tar.bz2
 /vim-8.0-844.tar.bz2
 /vim-8.0-885.tar.bz2
+/vim-8.0-891.tar.bz2
diff --git a/README.patches b/README.patches
index 4dfe323..95146fa 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,57 @@
+commit 7fadbf83256bb823b994a52758127594dd82ab39
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Aug 7 22:08:05 2017 +0200
+
+    patch 8.0.0891: uninitialized memory use with empty line in terminal
+    
+    Problem:    Uninitialized memory use with empty line in terminal.
+    Solution:   Initialize growarray earlier. (Yasuhiro Matsumoto, closes #1949)
+
+commit 75373f38087dd756babdbbf9f14fd4711712c5de
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Aug 7 22:02:30 2017 +0200
+
+    patch 8.0.0890: still many old style tests
+    
+    Problem:    Still many old style tests.
+    Solution:   Convert several tests to new style. (Yegappan Lakshmanan)
+
+commit e20b3eba731bafb97c609dd20a4c378c105acc0d
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Aug 7 21:26:29 2017 +0200
+
+    patch 8.0.0889: gcc gives warnings for uninitialized variables
+    
+    Problem:    Gcc gives warnings for uninitialized variables. (Tony Mechelynck)
+    Solution:   Initialize variables even though they are not used.
+
+commit 116a0f800c6a62e29c5af832df092507f1355c68
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Aug 7 21:17:57 2017 +0200
+
+    patch 8.0.0888: compiler warnings with 64 bit build
+    
+    Problem:    Compiler warnings with 64 bit build.
+    Solution:   Add type cast of change the type. (Mike Williams)
+
+commit 6d87e9e1c6a580609d48d4aa54a20b26b10c5b77
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Aug 7 20:51:51 2017 +0200
+
+    patch 8.0.0887: can create a logfile in the sandbox
+    
+    Problem:    Can create a logfile in the sandbox.
+    Solution:   Disable ch_logfile() in the sandbox. (Yasuhiro Matsumoto)
+
+commit f8d57a50496d854f3e82725bfde1543c9d01ff98
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Aug 7 20:38:42 2017 +0200
+
+    patch 8.0.0886: crash when using ":term ls"
+    
+    Problem:    Crash when using ":term ls".
+    Solution:   Fix line number computation.  Add a test for this.
+
 commit 33a43bee9cdc62f9cd0999eb23c6eca01b4d2d67
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Sun Aug 6 21:36:22 2017 +0200
diff --git a/sources b/sources
index d94c552..8e4343f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-885.tar.bz2) = 5c621d7b8b47bf8ef7639dcf65258b495b5bad59815c91638334356516a9c160ec076cee14c5994adb291b4f9a41799fc2d651899d85c6f9f88f061af857d406
+SHA512 (vim-8.0-891.tar.bz2) = b961ba041fa0bc5d17a170f4cda73b0283da2ba65810ad0dd602b739c0bc2b02045431d90af1c6c7861fe8e5d61857231ddc131cba9e88927f388ae5e08ecf18
diff --git a/vim.spec b/vim.spec
index dd847b8..676c177 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 885
+%define patchlevel 891
 %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 08 2017 Karsten Hopp <karsten@redhat.com> 8.0.891-1
+- patchlevel 891
+
 * Mon Aug 07 2017 Karsten Hopp <karsten@redhat.com> 8.0.885-1
 - patchlevel 885