diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-03-28 19:27:13 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-03-28 19:27:13 +0200 |
commit | a32095fc8fdf5fe3d487c86d9cc54adb1236731e (patch) | |
tree | f60a2b6045b281a39d052cbefc93371972900146 | |
parent | 8b877ac38e96424a08a8b8eb713ef4b3cf0064be (diff) | |
download | vim-git-a32095fc8fdf5fe3d487c86d9cc54adb1236731e.tar.gz |
patch 7.4.1670v7.4.1670
Problem: Completion doesn't work well for a variable containing "#".
Solution: Recognize the "#". (Watiko)
-rw-r--r-- | src/eval.c | 6 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c index ea7f9090a..2c093d415 100644 --- a/src/eval.c +++ b/src/eval.c @@ -3399,6 +3399,12 @@ set_context_for_expression( 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) diff --git a/src/version.c b/src/version.c index 826ee1deb..7039002fc 100644 --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1670, +/**/ 1669, /**/ 1668, |