diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-01-26 18:58:38 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-01-26 18:58:38 +0100 |
| commit | 6110a006d5b46b850247ed2c85bb7d7614cba025 (patch) | |
| tree | 91bd68123310aae73af3fa38c43fd71043d2a8e9 | |
| parent | 8e808d2b4d7e5edbde91f83bbdecfb97c881f847 (diff) | |
| download | vim-git-6110a006d5b46b850247ed2c85bb7d7614cba025.tar.gz | |
updated for version 7.3.418v7.3.418
Problem: When a user complete function returns -1 an error message is
given.
Solution: When -2 is returned stop completion silently. (Yasuhiro Matsumoto)
| -rw-r--r-- | src/edit.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/edit.c b/src/edit.c index 08b555ba2..9a0abf94f 100644 --- a/src/edit.c +++ b/src/edit.c @@ -5189,6 +5189,11 @@ ins_complete(c) return FAIL; } + /* Return value -2 means the user complete function wants to + * cancel the complete without an error. */ + if (col == -2) + return FAIL; + /* * Reset extended parameters of completion, when start new * completion. diff --git a/src/version.c b/src/version.c index 2d82cd80c..8dadac450 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 418, +/**/ 417, /**/ 416, |