mirror of
https://github.com/neovim/neovim.git
synced 2024-12-24 05:05:00 -07:00
Merge pull request #5356 from jbradaric/vim-7.4.1670
vim-patch:7.4.1670
This commit is contained in:
commit
ddb9f02712
@ -2684,6 +2684,10 @@ void set_context_for_expression(expand_T *xp, char_u *arg, cmdidx_T cmdidx)
|
||||
} else if (c == '=') {
|
||||
got_eq = TRUE;
|
||||
xp->xp_context = EXPAND_EXPRESSION;
|
||||
} else if (c == '#'
|
||||
&& xp->xp_context == EXPAND_EXPRESSION) {
|
||||
// Autoload function/variable contains '#'
|
||||
break;
|
||||
} else if ((c == '<' || c == '#')
|
||||
&& xp->xp_context == EXPAND_FUNCTIONS
|
||||
&& vim_strchr(xp->xp_pattern, '(') == NULL) {
|
||||
|
@ -773,7 +773,7 @@ static int included_patches[] = {
|
||||
1673,
|
||||
// 1672 NA
|
||||
// 1671,
|
||||
// 1670,
|
||||
1670,
|
||||
// 1669 NA
|
||||
// 1668 NA
|
||||
// 1667 NA
|
||||
|
Loading…
Reference in New Issue
Block a user