From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 16 Jan 2007 14:18:41 +0000 (+0000)
Subject: updated for version 7.0-184
X-Git-Tag: v7.0.184
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84c4d79ad4aa98e1f22742b9896696bb2414b21a;p=thirdparty%2Fvim.git

updated for version 7.0-184
---

diff --git a/src/if_cscope.c b/src/if_cscope.c
index 8866435ddb..97145aa9ca 100644
--- a/src/if_cscope.c
+++ b/src/if_cscope.c
@@ -627,10 +627,11 @@ cs_cnt_matches(idx)
 	 * If the database is out of date, or there's some other problem,
 	 * cscope will output error messages before the number-of-lines output.
 	 * Display/discard any output that doesn't match what we want.
+	 * Accept "\S*cscope: X lines", also matches "mlcscope".
 	 */
 	if ((stok = strtok(buf, (const char *)" ")) == NULL)
 	    continue;
-	if (strcmp((const char *)stok, "cscope:"))
+	if (strstr((const char *)stok, "cscope:") == NULL)
 	    continue;
 
 	if ((stok = strtok(NULL, (const char *)" ")) == NULL)
diff --git a/src/version.c b/src/version.c
index 36b2f94d5c..d4c093a8bb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    184,
 /**/
     183,
 /**/