From e3183a6d3c21196b0c1a296aec022fd96f94cf03 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Aug 10 2017 07:04:45 +0000
Subject: Merge branch 'f25' into f26


---

diff --git a/.gitignore b/.gitignore
index 9da03a8..23b537a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -96,3 +96,4 @@
 /vim-8.0-885.tar.bz2
 /vim-8.0-891.tar.bz2
 /vim-8.0-893.tar.bz2
+/vim-8.0-895.tar.bz2
diff --git a/README.patches b/README.patches
index 1c6c6a9..cfb1e82 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,21 @@
+commit 8ab3c1dc6bf70021f89e6e614b202606863bc168
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Aug 9 22:24:52 2017 +0200
+
+    patch 8.0.0895: filetype test fails on MS-Windows
+    
+    Problem:    Filetype test fails on MS-Windows.
+    Solution:   Fix file names.
+
+commit 0a0217abfabcee8b0779df2e18a186a4b41e18ce
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Aug 9 22:06:48 2017 +0200
+
+    patch 8.0.0894: there is no test for runtime filetype detection
+    
+    Problem:    There is no test for runtime filetype detection.
+    Solution:   Test a list of filetypes from patterns.
+
 commit 82b9ca05f40a627355e7c3bcf49b1f19ffbdaf87
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Tue Aug 8 23:06:46 2017 +0200
diff --git a/sources b/sources
index 5c7b5f2..0067351 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-893.tar.bz2) = 0ce2db5d9d3abcc149a3efe9ab900f54b081e773368254d2244f81686493787cd859bce0f1c212b9729c6d727d17c716f6a8951b46d481efe02d11d1a6a7b430
+SHA512 (vim-8.0-895.tar.bz2) = 881e073ef8644adb59393bbb4515089100013e954fc0be4c468f20d056e86e4740fb63c2d7c3edda231d0ba8d0ad7dc50f46f3a7e99079996dd817511bd4f7e8
diff --git a/vim.spec b/vim.spec
index c5e86b0..5264167 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 893
+%define patchlevel 895
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -770,6 +770,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Thu Aug 10 2017 Karsten Hopp <karsten@redhat.com> 8.0.895-1
+- patchlevel 895
+
 * Wed Aug 09 2017 Karsten Hopp <karsten@redhat.com> 8.0.893-1
 - patchlevel 893