summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-02-27 17:08:16 +0000
committerBram Moolenaar <Bram@vim.org>2007-02-27 17:08:16 +0000
commitf2a4e33ffb75a07ce7c64783113c82231b1b979a (patch)
treece562382630f7a9965e003edafc272d22da5543b
parent7f6ca07606564136a1037af796ae60da2bbd23cd (diff)
downloadvim-git-f2a4e33ffb75a07ce7c64783113c82231b1b979a.tar.gz
updated for version 7.0-204v7.0.204
-rw-r--r--src/if_cscope.c10
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 8 deletions
diff --git a/src/if_cscope.c b/src/if_cscope.c
index 97145aa9c..fd831393a 100644
--- a/src/if_cscope.c
+++ b/src/if_cscope.c
@@ -1932,14 +1932,8 @@ cs_print_tags_priv(matches, cntxts, num_matches)
if ((fname = strtok(NULL, (const char *)"\t")) == NULL)
continue;
if ((lno = strtok(NULL, (const char *)"\t")) == NULL)
- {
- /* if NULL, then no "extra", although in cscope's case, there
- * should always be "extra".
- */
- extra = NULL;
- }
-
- extra = lno + strlen(lno) + 1;
+ continue;
+ extra = strtok(NULL, (const char *)"\t");
lno[strlen(lno)-2] = '\0'; /* ignore ;" at the end */
diff --git a/src/version.c b/src/version.c
index aa1091161..f9ad029a7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 204,
+/**/
203,
/**/
202,