From 8f3b428fa739844aa5675bb1b62e114e0bdc491e Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Sep 05 2017 12:40:07 +0000
Subject: Merge branch 'f26' into f27


---

diff --git a/.gitignore b/.gitignore
index c83e7d4..01b095a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,3 +106,4 @@
 /vim-8.0-992.tar.bz2
 /vim-8.0-1030.tar.bz2
 /vim-8.0-1052.tar.bz2
+/vim-8.0-1056.tar.bz2
diff --git a/README.patches b/README.patches
index a9b06d0..9b3586f 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,43 @@
+commit 6e32f615eb824048a98666d1da4416bbeb7b2bed
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Sep 4 23:21:07 2017 +0200
+
+    patch 8.0.1056: cannot build with +diff but without +multi_byte
+    
+    Problem:    Cannot build with the diff feature but without the mutli-byte
+                feature.
+    Solution:   Remove #ifdefs. (John Marriott)
+
+commit 11aa62f8f949bb590b4d7792a334885fba5e4137
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Sep 4 22:56:01 2017 +0200
+
+    patch 8.0.1055: bufline test hangs on MS-Windows
+    
+    Problem:    Bufline test hangs on MS-Windows.
+    Solution:   Avoid message for writing file.  Source shared.vim when running
+                test individually.
+
+commit 178333783fac3a5edbc86f2e9c57a21c41f05697
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Sep 4 22:23:19 2017 +0200
+
+    patch 8.0.1054: terminal test fails on MS-Windows
+    
+    Problem:    Terminal test fails on MS-Windows.
+    Solution:   Disable the redirection test for now.  Improve scrape test to make
+                it less flaky.
+
+commit 9d954207e2cc807b475bb04f8b59ef5bb3772d99
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Sep 4 20:34:19 2017 +0200
+
+    patch 8.0.1053: setline() does not work on startup
+    
+    Problem:    setline() does not work on startup. (Manuel Ortega)
+    Solution:   Do not check for ml_mfp to be set for the current buffer.
+                (Christian Brabandt)
+
 commit e88fc7a574263fd399c6815378bcd8fd228d8b54
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Sun Sep 3 20:59:40 2017 +0200
diff --git a/sources b/sources
index 8e29041..108ff94 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-1052.tar.bz2) = be270e35c65c830af3e01cd42b39dffa88df56955fa99818dfdecd94c0fdc7fcdafa6c37edd807f9788b8363d052b01bd5d9d6c92c64fc9503b50c1ae7f196b7
+SHA512 (vim-8.0-1056.tar.bz2) = ecfb618141b5185198a05735a5e81df4224fb67f999f1d81ccef6c4d0b1c2be37240ea37f24a181b3db9d4f48b94ebfa8e755818e06bdbbf42c4aa057c9eda33
diff --git a/vim.spec b/vim.spec
index 82ff832..eb57fc2 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 1052
+%define patchlevel 1056
 %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 Sep 05 2017 Karsten Hopp <karsten@redhat.com> 8.0.1056-1
+- patchlevel 1056
+
 * Mon Sep 04 2017 Karsten Hopp <karsten@redhat.com> 8.0.1052-1
 - patchlevel 1052