From 92a40501b8a4f97459c789d051d060a4c4fb9b27 Mon Sep 17 00:00:00 2001 From: edyfox Date: Wed, 17 Jan 2007 00:52:51 +0000 Subject: [PATCH] Patch 7.0.184 Problem: When the cscope program is called "mlcscope" the Cscope interface doesn't work. Solution: Accept "\S*cscope:" instead of "cscope:". (Frodak D. Baksik) Files: src/if_cscope.c git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/vim7@201 2a77ed30-b011-0410-a7ad-c7884a0aa172 --- src/if_cscope.c | 3 ++- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/if_cscope.c b/src/if_cscope.c index 8866435d..97145aa9 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 36b2f94d..d4c093a8 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 */ /**/ + 184, +/**/ 183, /**/ 182, -- 2.11.4.GIT