diff options
| author | Bram Moolenaar <bram@vim.org> | 2013-06-30 12:21:24 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2013-06-30 12:21:24 +0200 |
| commit | 4f9e4fba31aca5b5377fdd2518c2aad086a9f027 (patch) | |
| tree | 27c7922b20aa1a1b6e2e139ac08fc4ce65b87706 | |
| parent | e47cebbb62b88f3e4bc318e3dcf70635e80a4902 (diff) | |
| download | vim-4f9e4fba31aca5b5377fdd2518c2aad086a9f027.tar.gz | |
Problem: Command line completion does not work.
Solution: Move setting xp_line down. (Daniel Thau)
| -rw-r--r-- | src/ex_getln.c | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index 18a708bf..11571d19 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -4379,11 +4379,6 @@ set_cmd_context(xp, str, len, col) int old_char = NUL; char_u *nextcomm; - /* Store the string here so that call_user_expand_func() can get to them - * easily. */ - xp->xp_line = str; - xp->xp_col = col; - /* * Avoid a UMR warning from Purify, only save the character if it has been * written before. @@ -4414,6 +4409,11 @@ set_cmd_context(xp, str, len, col) while (nextcomm != NULL) nextcomm = set_one_cmd_context(xp, nextcomm); + /* Store the string here so that call_user_expand_func() can get to them + * easily. */ + xp->xp_line = str; + xp->xp_col = col; + str[col] = old_char; } diff --git a/src/version.c b/src/version.c index 18588e8c..3a0b3673 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1271, +/**/ 1270, /**/ 1269, |