diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-07-24 12:34:30 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-07-24 12:34:30 +0000 |
| commit | 4f68858766b47e31a574a506fe9fafed0e90b672 (patch) | |
| tree | a5a9012a7b11b3b646c5d6ce1daf73ad48cb788f /src/ex_docmd.c | |
| parent | fe40d1a0b0a2ae22fc8a05746d1f867f752f98d3 (diff) | |
updated for version 7.1-036v7.1.036
Diffstat (limited to 'src/ex_docmd.c')
| -rw-r--r-- | src/ex_docmd.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index a623a52e15..3605a422ca 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -3406,14 +3406,13 @@ set_one_cmd_context(xp, buff) case CMD_windo: return arg; -#ifdef FEAT_SEARCH_EXTRA +#ifdef FEAT_CMDL_COMPL +# ifdef FEAT_SEARCH_EXTRA case CMD_match: if (*arg == NUL || !ends_excmd(*arg)) { - /* Dummy call to clear variables. */ - set_context_in_highlight_cmd(xp, (char_u *)"link n"); - xp->xp_context = EXPAND_HIGHLIGHT; - xp->xp_pattern = arg; + /* also complete "None" */ + set_context_in_echohl_cmd(xp, arg); arg = skipwhite(skiptowhite(arg)); if (*arg != NUL) { @@ -3422,9 +3421,8 @@ set_one_cmd_context(xp, buff) } } return find_nextcmd(arg); -#endif +# endif -#ifdef FEAT_CMDL_COMPL /* * All completion for the +cmdline_compl feature goes here. */ @@ -3622,8 +3620,7 @@ set_one_cmd_context(xp, buff) break; case CMD_echohl: - xp->xp_context = EXPAND_HIGHLIGHT; - xp->xp_pattern = arg; + set_context_in_echohl_cmd(xp, arg); break; #endif case CMD_highlight: |