From 56bc468fa38d741cde52f554dfb57caef05430f3 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Feb 28 2017 12:25:13 +0000
Subject: Merge branch 'f25'


---

diff --git a/.gitignore b/.gitignore
index 8258712..1c08e3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,4 @@
 /vim-8.0-347.tar.bz2
 /vim-8.0-363.tar.bz2
 /vim-8.0-381.tar.bz2
+/vim-8.0-386.tar.bz2
diff --git a/README.patches b/README.patches
index ece03d0..2d39e80 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,48 @@
+commit 5b3af14b34c97ab58bfd4699bc2f3e5a2b704117
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Feb 27 22:59:40 2017 +0100
+
+    patch 8.0.0386: tiny build has a problem with generating the options test
+    
+    Problem:    Tiny build has a problem with generating the options test.
+    Solution:   Change the "if" to skip over statements.
+
+commit b5e8377364110ee70090274da15d202778e96a64
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Feb 27 21:48:26 2017 +0100
+
+    patch 8.0.0385: no tests for arabic
+    
+    Problem:    No tests for arabic.
+    Solution:   Add a first test for arabic. (Dominique Pelle, closes #1518)
+
+commit d512e17ea4cebe547197b759a047138228acc06f
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Feb 27 21:35:53 2017 +0100
+
+    patch 8.0.0384: timer test failed for no apparent reason
+    
+    Problem:    Timer test failed for no apparent reason.
+    Solution:   Mark the test as flaky.
+
+commit 10a8da0594406c37f8971cbd16ebbebf831dc60f
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Feb 27 21:11:35 2017 +0100
+
+    patch 8.0.0383: misplaced #ifdef
+    
+    Problem:    Misplaced #ifdef. (Christ van Willigen)
+    Solution:   Split assignment.
+
+commit 88e7688edaf6fcf079d3c1b1070c852cfbb28185
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Feb 27 20:33:46 2017 +0100
+
+    patch 8.0.0382: warning in tiny build for unused variable
+    
+    Problem:    Warning in tiny build for unused variable. (Tony Mechelynck)
+    Solution:   Add #ifdefs.
+
 commit aeb661e1f4a491286ef7af8c3105aff1f3b16f1c
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Sun Feb 26 19:59:59 2017 +0100
diff --git a/sources b/sources
index 6cd2a17..72738f9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-381.tar.bz2) = 0fb2142b613e27447dda4977711a74c9d9838eba0ddeae1e04c51adb660b869a6630840358c67d67640cafd2f2b89c107cdc6185b0d2d54145acf61391791dd4
+SHA512 (vim-8.0-386.tar.bz2) = 2876e4517ec79e1be02b814d07adc9c47eaddbb447e05fa1e16ee9d1b5e919e77b3bfb148cdd5c4cdafc3bcf0dd952734158a6e41ae3372abe2d5ecc62cd2a60
diff --git a/vim.spec b/vim.spec
index 643456c..e5dbfee 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 381
+%define patchlevel 386
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -768,6 +768,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Tue Feb 28 2017 Karsten Hopp <karsten@redhat.com> 8.0.386-1
+- patchlevel 386
+
 * Mon Feb 27 2017 Karsten Hopp <karsten@redhat.com> 8.0.381-1
 - patchlevel 381