From b84e108b9cce3d3e61f2617e71f0ce6fd3a30e38 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Jan 19 2017 10:11:47 +0000
Subject: Merge branch 'f25'


---

diff --git a/.gitignore b/.gitignore
index 34a5323..9b893a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
 /vim-8.0-176.tar.bz2
 /vim-8.0-194.tar.bz2
 /vim-8.0-197.tar.bz2
+/vim-8.0-206.tar.bz2
diff --git a/README.patches b/README.patches
index 8308faf..839baff 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,92 @@
+commit 8822744b4d9d40aa1fd59870a8bdd7c64c59a42b
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Jan 17 22:16:00 2017 +0100
+
+    patch 8.0.0206: test coverage for :retab insufficient
+    
+    Problem:    Test coverage for :retab insufficient.
+    Solution:   Add test for :retab. (Dominique Pelle, closes #1391)
+
+commit 5e4e1b12998b1ed99138cad1c5da4d430f798547
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Jan 17 22:09:45 2017 +0100
+
+    patch 8.0.0205: wrong behavior after :undojoin
+    
+    Problem:    After :undojoin some commands don't work properly, such as :redo.
+                (Matthew Malcomson)
+    Solution:   Don't set curbuf->b_u_curhead. (closes #1390)
+
+commit eb46f8fa14a586779f55b1c7f1648f559618322e
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Jan 17 19:48:53 2017 +0100
+
+    patch 8.0.0204: compiler warns for uninitialized variable
+    
+    Problem:    Compiler warns for uninitialized variable. (Tony Mechelynck)
+    Solution:   When skipping set "id" to -1.
+
+commit 6e78e27b8aace2e4c2412bfc4de6567509258d28
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Jan 17 19:20:15 2017 +0100
+
+    patch 8.0.0203: order of complication flags is sometimes wrong
+    
+    Problem:    Order of complication flags is sometimes wrong.
+    Solution:   Put interface-specific flags before ALL_CFLAGS. (idea by Yousong
+                Zhou, closes #1100)
+
+commit 4007ed4a5e8c34197078e9d5718bd1d4a429dd23
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Jan 17 18:14:54 2017 +0100
+
+    patch 8.0.0202: no test for invalid syntax group name
+    
+    Problem:    No test for invalid syntax group name.
+    Solution:   Add a test for group name error and warning.
+
+commit d61e8aaae57bd66279def479462bf11c22ec2f1c
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Jan 17 17:44:46 2017 +0100
+
+    patch 8.0.0201: completion of highlight groups includes cleared names
+    
+    Problem:    When completing a group name for a highlight or syntax command
+                cleared groups are included.
+    Solution:   Skip groups that have been cleared.
+
+commit 58f60ca2fcd2858faac84e386b3ccf5ced75084d
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Jan 17 17:19:00 2017 +0100
+
+    patch 8.0.0200: some syntax arguments are not tested
+    
+    Problem:    Some syntax arguments are not tested.
+    Solution:   Add more syntax command tests.
+
+commit 6d721c7e10251ad8c89a461eed99d8cf2659c1df
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Jan 17 16:56:28 2017 +0100
+
+    patch 8.0.0199: compiler warnings for libcall
+    
+    Problem:    Warning for an unused parameter when the libcall feature is
+                disabled.  Warning for a function type cast when compiling with
+                -pedantic.
+    Solution:   Add UNUSED.  Use a different type cast. (Damien Molinier)
+
+commit de318c5c35ed0d65fd2a07196cb8acd5ee6d9bf8
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Jan 17 16:27:10 2017 +0100
+
+    patch 8.0.0198: some syntax arguments take effect even after "if 0"
+    
+    Problem:    Some syntax arguments take effect even after "if 0". (Taylor
+                Venable)
+    Solution:   Properly skip the syntax statements.  Make "syn case" and "syn
+                conceal" report the current state.  Fix that "syn clear" didn't
+                reset the conceal flag.  Add tests for :syntax skipping properly.
+
 commit 369b6f57c426b4bf39b4a0cac8d21ed1b5f7de4d
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Tue Jan 17 12:22:32 2017 +0100
diff --git a/sources b/sources
index f1eff4e..228b90e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-197.tar.bz2) = 1fd20428635cf21f7c708f16ae5e1adf1b890afc5290480bd7fba4f8ea6aaa93c26cea8a69f2c9f459cc7c5c1b724afbc28ed585f51bc7db0b094884cce34eff
+SHA512 (vim-8.0-206.tar.bz2) = 6537ee9b706a110646c117c236c55406d454e5bc8f9a710b38bfd53af0eed1fae3c1f855db1c08ac0992e2dbe7f681f10259d2031c6d6aca9d79502db00904d8
diff --git a/vim.spec b/vim.spec
index 7654f01..5fb7ea4 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 197
+%define patchlevel 206
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -758,6 +758,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Thu Jan 19 2017 Karsten Hopp <karsten@redhat.com> 8.0.206-1
+- patchlevel 206
+
 * Tue Jan 17 2017 Karsten Hopp <karsten@redhat.com> 8.0.197-1
 - patchlevel 197
 - update runtime files