From ec4ad9731129460aebe6ccc303f48a747d217867 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Feb 13 2017 17:26:01 +0000
Subject: Merge branch 'f25'


---

diff --git a/.gitignore b/.gitignore
index 79d216c..4fd963f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@
 /vim-8.0-314.tar.bz2
 /vim-8.0-318.tar.bz2
 /vim-8.0-324.tar.bz2
+/vim-8.0-329.tar.bz2
diff --git a/README.patches b/README.patches
index 0795eab..e91cb2a 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,49 @@
+commit 10434674821939222bf552d15d93e0132d13badc
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sun Feb 12 19:59:08 2017 +0100
+
+    patch 8.0.0329: xfontset and guifontwide are not tested
+    
+    Problem:    Xfontset and guifontwide are not tested.
+    Solution:   Add tests. (Kazunobu Kuriyama)
+
+commit 23a5558cfd860401aa694f0302d621887440f031
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sun Feb 12 18:45:25 2017 +0100
+
+    patch 8.0.0328: the "zero count" error doesn't have a number
+    
+    Problem:    The "zero count" error doesn't have a number. (Hirohito Higashi)
+    Solution:   Give it a number and be more specific about the error.
+
+commit 75c19464ed7fb6024af64747379e61abc4e4a483
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sun Feb 12 18:34:05 2017 +0100
+
+    patch 8.0.0327: error message in cmdline window is not translated
+    
+    Problem:    The E11 error message in the command line window is not
+                translated.
+    Solution:   use _(). (Hirohito Higashi)
+
+commit 24f8f543d4036c5d2ce4ea6973a174cf2176cb72
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sat Feb 11 23:00:36 2017 +0100
+
+    patch 8.0.0326: packadd test uses wrong directory name
+    
+    Problem:    Packadd test uses wrong directory name.
+    Solution:   Use the variable name value. (Hirohito Higashi)
+
+commit 913727e56761d57aaba61197c2d3485418dea7eb
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sat Feb 11 11:34:58 2017 +0100
+
+    patch 8.0.0325: packadd test does not clean up symlink
+    
+    Problem:    Packadd test does not clean up symlink.
+    Solution:   Delete the link. (Hirohito Higashi)
+
 commit f1f6f3f7df2938b3583e341482d96c1d53124c51
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Thu Feb 9 22:28:20 2017 +0100
diff --git a/sources b/sources
index 8bf95db..00a395f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-324.tar.bz2) = c5afbe84887c0a3fc59ec9eae24af3cec89707e0393610c5dfee5e1d7c224fc64e243f413451a5445cb3d0e155bf9680de43fe1a36fec8fb4a9fa424a9339bde
+SHA512 (vim-8.0-329.tar.bz2) = 3c8ac3459b47da126b3b22d319e004f732729ed6009d90e05437a6b6069882f82f08d7173913f1e6c47ec23ef1027eb723eb9704aadf9536fc511da14d9cc3a2
diff --git a/vim.spec b/vim.spec
index d543753..28be1ac 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 324
+%define patchlevel 329
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -765,6 +765,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Mon Feb 13 2017 Karsten Hopp <karsten@redhat.com> 8.0.329-1
+- patchlevel 329
+
 * Fri Feb 10 2017 Karsten Hopp <karsten@redhat.com> 8.0.324-1
 - patchlevel 324