From ce76841cc07ab0bab4ccd942d5f8b63af5f2997d Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Mar 08 2017 14:41:29 +0000
Subject: Merge branch 'f25' into f26


---

diff --git a/.gitignore b/.gitignore
index 8ec830d..b818ac1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,4 @@
 /vim-8.0-402.tar.bz2
 /vim-8.0-425.tar.bz2
 /vim-8.0-427.tar.bz2
+/vim-8.0-430.tar.bz2
diff --git a/README.patches b/README.patches
index 8334402..c65a0dd 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,34 @@
+commit bb962262eb6b18d93161d7506317d215ae80bfe5
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Mar 8 00:01:35 2017 +0100
+
+    patch 8.0.0430: options test fails or hangs on MS-Windows
+    
+    Problem:    Options test fails or hangs on MS-Windows.
+    Solution:   Run it separately instead of part of test_alot.  Use "-S" instead
+                of "-u" to run the script.  Fix failures.
+
+commit e8512d7fedbddd8d464b2c589e6ba5ab9a41bc78
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Mar 7 22:33:32 2017 +0100
+
+    patch 8.0.0429: options test does not always test everything
+    
+    Problem:    Options test does not always test everything.
+    Solution:   Fix dependency for opt_test.vim.  Give a message when opt_test.vim
+                was not found.
+
+commit 65408f7dfbd4bb50d740a8b8f2171080571223f2
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Mar 7 21:31:27 2017 +0100
+
+    patch 8.0.0428: git and hg see new files after running tests
+    
+    Problem:    Git and hg see new files after running tests. (Manuel Ortega)
+    Solution:   Add the generated file to .hgignore (or .gitignore). Delete the
+                resulting verbose file. (Christian Brabandt)  Improve dependency
+                on opt_test.vim.  Reset the 'more' option.
+
 commit ad4187e6fc9c8e1083a172852d958a70a689a75c
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Mon Mar 6 21:45:20 2017 +0100
diff --git a/sources b/sources
index 7afb015..25b1948 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-427.tar.bz2) = 381d5d365a390ddb3282d15908f2d8874da6467ba6fa0bfcb3e5a31995c67ed5e9da9fac4c63aa1b36f8e3af494e33f9e454871fc3a4f0ee2ef1715128ff5d9e
+SHA512 (vim-8.0-430.tar.bz2) = 798a6d68dff2f36eef46244c027e3e1245bfc51462ad0fb814b424457323f1c63124b8ad594ed7404eeee52e6fcc4452527c5bcb2d7e5b5b419e08b215f09a74
diff --git a/vim.spec b/vim.spec
index 1697ccd..58d128e 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 427
+%define patchlevel 430
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -768,6 +768,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Wed Mar 08 2017 Karsten Hopp <karsten@redhat.com> 8.0.430-1
+- patchlevel 430
+
 * Tue Mar 07 2017 Karsten Hopp <karsten@redhat.com> 8.0.427-1
 - patchlevel 427