diff --git a/src/if_cscope.c b/src/if_cscope.c index 8866435ddbad3cce0b5a8c380219288b8f14b5a9..97145aa9ca448979c775600bba9ed9f365ae69f8 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 36b2f94d5cf0ab1dc4b509e2ffd84e0ede915fc4..d4c093a8bb5203cb28bb780a6a814cb3af36e184 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, /**/