summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-09-05 12:06:33 +0200
committerBram Moolenaar <bram@vim.org>2013-09-05 12:06:33 +0200
commitc594d0b3c02a0bbbe00372fc092e3c889003e0f5 (patch)
tree93cbedba3e1f823cf3c3aa765a8276113d2b418b
parentc265c0b75bcf2ad0fe72a86f98a8b50715046d10 (diff)
downloadvim-c594d0b3c02a0bbbe00372fc092e3c889003e0f5.tar.gz
updated for version 7.4.017v7.4.017v7-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.
-rw-r--r--src/tag.c12
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 4 deletions
diff --git a/src/tag.c b/src/tag.c
index 8a3c81c8..55ace15b 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 ce71dff7..97657b6e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 17,
+/**/
16,
/**/
15,