diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-08-16 19:24:22 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-08-16 19:24:22 +0000 |
| commit | f83c5c0113cdfbdc176dcdf65baca77f436ed54f (patch) | |
| tree | 8b5ea4ed5afddf089d6eb9775909965b9f965d20 /src | |
| parent | f30e74c11333c37d777b929ea77f5716cc977d27 (diff) | |
| download | vim-f83c5c0113cdfbdc176dcdf65baca77f436ed54f.zip | |
updated for version 7.0-061
Diffstat (limited to 'src')
| -rw-r--r-- | src/edit.c | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/edit.c b/src/edit.c index 4ee21d5f3..a8044151b 100644 --- a/src/edit.c +++ b/src/edit.c @@ -4691,18 +4691,12 @@ ins_complete(c) (int)STRLEN(compl_pattern), curs_col); if (compl_xp.xp_context == EXPAND_UNSUCCESSFUL || compl_xp.xp_context == EXPAND_NOTHING) - { + /* No completion possible, use an empty pattern to get a + * "pattern not found" message. */ compl_col = curs_col; - compl_length = 0; - vim_free(compl_pattern); - compl_pattern = NULL; - } else - { - startcol = (int)(compl_xp.xp_pattern - compl_pattern); - compl_col = startcol; - compl_length = curs_col - startcol; - } + compl_col = (int)(compl_xp.xp_pattern - compl_pattern); + compl_length = curs_col - compl_col; } else if (ctrl_x_mode == CTRL_X_FUNCTION || ctrl_x_mode == CTRL_X_OMNI) { diff --git a/src/version.c b/src/version.c index 5cfc2346e..7ed4e4b23 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 61, +/**/ 60, /**/ 59, |