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

patch 7.4.2331

Browse Source 
Problem:    Using CTRL-X CTRL-V to complete a command line from Insert mode
            does not work after entering an expression on the command line.
Solution:   Don't use "ccline" when not actually using a command line. (test
            by Hirohito Higashi)
This commit is contained in:
Bram Moolenaar
2016-09-05 21:51:14 +02:00
parent 030cddc7ec
commit 33a80eeb85
5 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ex_getln.c
View File

@@ -4509,7 +4509,7 @@ set_expand_context(expand_T *xp)
xp->xp_context = EXPAND_NOTHING;
return;
}
set_cmd_context(xp, ccline.cmdbuff, ccline.cmdlen, ccline.cmdpos);
set_cmd_context(xp, ccline.cmdbuff, ccline.cmdlen, ccline.cmdpos, TRUE);
}
void
@@ -4517,7 +4517,8 @@ set_cmd_context(
expand_T *xp,
char_u *str, /* start of command line */
int len, /* length of command line (excl. NUL) */
int col) /* position of cursor */
int col, /* position of cursor */
int use_ccline UNUSED) /* use ccline for info */
{
int old_char = NUL;
char_u *nextcomm;
@@ -4532,14 +4533,14 @@ set_cmd_context(
nextcomm = str;
#ifdef FEAT_EVAL
if (ccline.cmdfirstc == '=')
if (use_ccline && 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)
else if (use_ccline && ccline.input_fn)
{
xp->xp_context = ccline.xp_context;
xp->xp_pattern = ccline.cmdbuff;