diff options
| author | Bram Moolenaar <Bram@vim.org> | 2005-07-09 21:03:22 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2005-07-09 21:03:22 +0000 |
| commit | a466c99842c4b482c847b6336aae458509963dcd (patch) | |
| tree | 5bc5de38228a1275955e7b9fc5d0330955fbf45c /src/ex_docmd.c | |
| parent | ac76e4dd911ffbfe12aa5976c8629d3e310ccce9 (diff) | |
| download | vim-git-a466c99842c4b482c847b6336aae458509963dcd.tar.gz | |
updated for version 7.0106
Diffstat (limited to 'src/ex_docmd.c')
| -rw-r--r-- | src/ex_docmd.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index ebfac55fd..4a83ca013 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -3252,7 +3252,7 @@ set_one_cmd_context(xp, buff) ++xp->xp_pattern; #if defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL) /* Avoid that the assignment uses EXPAND_FILES again. */ - if (compl != EXPAND_USER_DEFINED) + if (compl != EXPAND_USER_DEFINED && compl != EXPAND_USER_LIST) compl = EXPAND_ENV_VARS; #endif } @@ -4992,6 +4992,7 @@ static struct {EXPAND_COMMANDS, "command"}, #if defined(FEAT_EVAL) && defined(FEAT_CMDL_COMPL) {EXPAND_USER_DEFINED, "custom"}, + {EXPAND_USER_LIST, "customlist"}, #endif {EXPAND_DIRECTORIES, "dir"}, {EXPAND_ENV_VARS, "environment"}, @@ -5301,7 +5302,8 @@ invalid_count: return FAIL; } #if defined(FEAT_EVAL) && defined(FEAT_CMDL_COMPL) - if (*compl != EXPAND_USER_DEFINED && arg != NULL) + if (*compl != EXPAND_USER_DEFINED && *compl != EXPAND_USER_LIST && + arg != NULL) #else if (arg != NULL) #endif @@ -5310,7 +5312,8 @@ invalid_count: return FAIL; } #if defined(FEAT_EVAL) && defined(FEAT_CMDL_COMPL) - if (*compl == EXPAND_USER_DEFINED && arg == NULL) + if ((*compl == EXPAND_USER_DEFINED || *compl == EXPAND_USER_LIST) && + arg == NULL) { EMSG(_("E467: Custom completion requires a function argument")); return FAIL; |