From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 20 Jan 2015 16:27:22 +0000 (+0100)
Subject: updated for version 7.4.586
X-Git-Tag: v7.4.586
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6bf7a5933f50db03455104a018f5de1efd82b7fb;p=thirdparty%2Fvim.git

updated for version 7.4.586
Problem:    Parallel building of the documentation html files is not reliable.
Solution:   Remove a cyclic dependency. (Reiner Herrmann)
---

diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile
index a6610a937a..86ccb74ffa 100644
--- a/runtime/doc/Makefile
+++ b/runtime/doc/Makefile
@@ -229,7 +229,6 @@ HTMLS = \
 	starting.html \
 	syntax.html \
 	tabpage.html \
-	tags.html \
 	tagsrch.html \
 	term.html \
 	tips.html \
diff --git a/src/version.c b/src/version.c
index 6fe2b32ce1..d43e4c1ca5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    586,
 /**/
     585,
 /**/