aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

updated for version 7.1-036

Browse Source
This commit is contained in:
Bram Moolenaar
2007-07-24 12:34:30 +00:00
parent fe40d1a0b0
commit 4f68858766
6 changed files with 76 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ex_getln.c
View File

@@ -268,7 +268,9 @@ getcmdline(firstc, count, indent)
{
xpc.xp_context = ccline.xp_context;
xpc.xp_pattern = ccline.cmdbuff;
# if defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)
xpc.xp_arg = ccline.xp_arg;
# endif
}
#endif
@@ -4151,13 +4153,19 @@ set_cmd_context(xp, str, len, col)
#ifdef FEAT_EVAL
if (ccline.cmdfirstc == '=')
{
# ifdef FEAT_CMDL_COMPL
/* pass CMD_SIZE because there is no real command */
set_context_for_expression(xp, str, CMD_SIZE);
# endif
}
else if (ccline.input_fn)
{
xp->xp_context = ccline.xp_context;
xp->xp_pattern = ccline.cmdbuff;
# if defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)
xp->xp_arg = ccline.xp_arg;
# endif
}
else
#endif
@@ -4505,6 +4513,12 @@ ExpandGeneric(xp, regmatch, num_file, file, func)
if (xp->xp_context != EXPAND_MENUNAMES && xp->xp_context != EXPAND_MENUS)
sort_strings(*file, *num_file);
#ifdef FEAT_CMDL_COMPL
/* Reset the variables used for special highlight names expansion, so that
* they don't show up when getting normal highlight names by ID. */
reset_expand_highlight();
#endif
return OK;
}