summaryrefslogtreecommitdiffstats
path: root/src/if_cscope.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-04-22 14:25:01 +0000
committerBram Moolenaar <Bram@vim.org>2009-04-22 14:25:01 +0000
commit7bfef80fab8085fe5a5b3e2f2e3d3661e733d64f (patch)
treebc718db18eece798ed68d6b2adedf5ba664fc2ce /src/if_cscope.c
parent69f2d5a9ac947a5fcd4b2903f60c4c0c26cdded0 (diff)
updated for version 7.2-156v7.2.156
Diffstat (limited to 'src/if_cscope.c')
-rw-r--r--src/if_cscope.c22
1 files changed, 17 insertions, 5 deletions
diff --git a/src/if_cscope.c b/src/if_cscope.c
index 2407ad03e3..1b0a8cdad2 100644
--- a/src/if_cscope.c
+++ b/src/if_cscope.c
@@ -98,6 +98,7 @@ cs_usage_msg(x)
static enum
{
EXP_CSCOPE_SUBCMD, /* expand ":cscope" sub-commands */
+ EXP_SCSCOPE_SUBCMD, /* expand ":scscope" sub-commands */
EXP_CSCOPE_FIND, /* expand ":cscope find" arguments */
EXP_CSCOPE_KILL /* expand ":cscope kill" arguments */
} expand_what;
@@ -112,12 +113,23 @@ get_cscope_name(xp, idx)
expand_T *xp;
int idx;
{
+ int current_idx;
+ int i;
+
switch (expand_what)
{
case EXP_CSCOPE_SUBCMD:
/* Complete with sub-commands of ":cscope":
* add, find, help, kill, reset, show */
return (char_u *)cs_cmds[idx].name;
+ case EXP_SCSCOPE_SUBCMD:
+ /* Complete with sub-commands of ":scscope": same sub-commands as
+ * ":cscope" but skip commands which don't support split windows */
+ for (i = 0, current_idx = 0; cs_cmds[i].name != NULL; i++)
+ if (cs_cmds[i].cansplit)
+ if (current_idx++ == idx)
+ break;
+ return (char_u *)cs_cmds[i].name;
case EXP_CSCOPE_FIND:
{
const char *query_type[] =
@@ -133,15 +145,13 @@ get_cscope_name(xp, idx)
}
case EXP_CSCOPE_KILL:
{
- int i;
- int current_idx = 0;
static char_u connection[2];
/* ":cscope kill" accepts connection numbers or partial names of
* the pathname of the cscope database as argument. Only complete
* with connection numbers. -1 can also be used to kill all
* connections. */
- for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
+ for (i = 0, current_idx = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
{
if (csinfo[i].fname == NULL)
continue;
@@ -165,16 +175,18 @@ get_cscope_name(xp, idx)
* Handle command line completion for :cscope command.
*/
void
-set_context_in_cscope_cmd(xp, arg)
+set_context_in_cscope_cmd(xp, arg, cmdidx)
expand_T *xp;
char_u *arg;
+ cmdidx_T cmdidx;
{
char_u *p;
/* Default: expand subcommands */
xp->xp_context = EXPAND_CSCOPE;
- expand_what = EXP_CSCOPE_SUBCMD;
xp->xp_pattern = arg;
+ expand_what = (cmdidx == CMD_scscope)
+ ? EXP_SCSCOPE_SUBCMD : EXP_CSCOPE_SUBCMD;
/* (part of) subcommand already typed */
if (*arg != NUL)