From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 5 Sep 2013 10:06:33 +0000 (+0200)
Subject: updated for version 7.4.017
X-Git-Tag: v7.4.017
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=966d71c852e1126883846817d3a16590268298f5;p=vim

updated for version 7.4.017
Problem:    ":help !!" does not find the "!!" tag in the help file. (Ben
            Fritz)
Solution:   When reading the start of the tags file do parse lines that are
            not header lines.
---

diff --git a/src/tag.c b/src/tag.c
index 8a3c81c81..55ace15bf 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -1797,13 +1797,16 @@ line_read_in:
 	     */
 	    if (state == TS_START)
 	    {
-		/* The header ends when the line sorts below "!_TAG_".
-		 * There may be non-header items before the header though,
-		 * e.g. "!" itself. When case is folded lower case letters
-		 * sort before "_". */
+		/* The header ends when the line sorts below "!_TAG_".  When
+		 * case is folded lower case letters sort before "_". */
 		if (STRNCMP(lbuf, "!_TAG_", 6) <= 0
 				|| (lbuf[0] == '!' && ASCII_ISLOWER(lbuf[1])))
 		{
+		    if (STRNCMP(lbuf, "!_TAG_", 6) != 0)
+			/* Non-header item before the header, e.g. "!" itself.
+			 */
+			goto parse_line;
+
 		    /*
 		     * Read header line.
 		     */
@@ -1898,6 +1901,7 @@ line_read_in:
 #endif
 	    }
 
+parse_line:
 	    /*
 	     * Figure out where the different strings are in this line.
 	     * For "normal" tags: Do a quick check if the tag matches.
diff --git a/src/version.c b/src/version.c
index ce71dff77..97657b6e5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    17,
 /**/
     16,
 /**/