From 56e389f4282707023b3dee280b8a20f5c167790d Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Mar 07 2017 09:32:52 +0000
Subject: Merge branch 'f25' into f26


---

diff --git a/.gitignore b/.gitignore
index c7ec693..8ec830d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@
 /vim-8.0-398.tar.bz2
 /vim-8.0-402.tar.bz2
 /vim-8.0-425.tar.bz2
+/vim-8.0-427.tar.bz2
diff --git a/README.patches b/README.patches
index bb95f32..8334402 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,21 @@
+commit ad4187e6fc9c8e1083a172852d958a70a689a75c
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Mar 6 21:45:20 2017 +0100
+
+    patch 8.0.0427: 'makeencoding' missing from the options window
+    
+    Problem:    'makeencoding' missing from the options window.
+    Solution:   Add the entry.
+
+commit 300af82eca3dd5fec6be5516f16c9fd344ae104b
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Mar 6 20:28:10 2017 +0100
+
+    patch 8.0.0426: insufficient testing for statusline
+    
+    Problem:    Insufficient testing for statusline.
+    Solution:   Add several tests. (Dominique Pelle, closes #1534)
+
 commit a6c07603ca2fa98a4184f5fd5ab021adcf5156b2
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Sun Mar 5 21:18:27 2017 +0100
diff --git a/sources b/sources
index 5132d7c..7afb015 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-425.tar.bz2) = 1d4de900148c4ecafc61b3c4d2c00951e02ca21bd949a07c4e7574d59b6da79d886db14f3305a1176f83dfb05936b8b4aac7bd2e3f8dddef588b485e063fa1d6
+SHA512 (vim-8.0-427.tar.bz2) = 381d5d365a390ddb3282d15908f2d8874da6467ba6fa0bfcb3e5a31995c67ed5e9da9fac4c63aa1b36f8e3af494e33f9e454871fc3a4f0ee2ef1715128ff5d9e
diff --git a/vim.spec b/vim.spec
index 23cce32..1697ccd 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 425
+%define patchlevel 427
 %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 Mar 07 2017 Karsten Hopp <karsten@redhat.com> 8.0.427-1
+- patchlevel 427
+
 * Mon Mar 06 2017 Karsten Hopp <karsten@redhat.com> 8.0.425-1
 - patchlevel 425