aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

updated for version 7.3.404

Browse Source 
Problem:    When a complete function uses refresh "always" redo will not work
            properly.
Solution:   Do not reset compl_leader when compl_opt_refresh_always is set.
            (Yasuhiro Matsumoto)
This commit is contained in:
Bram Moolenaar
2012-01-20 14:32:27 +01:00
parent 73633f84d6
commit 6d6cec8375
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/edit.c
View File

@@ -3465,11 +3465,17 @@ ins_compl_addleader(c)
if (ins_compl_need_restart())
ins_compl_restart();
vim_free(compl_leader);
compl_leader = vim_strnsave(ml_get_curline() + compl_col,
/* When 'always' is set, don't reset compl_leader. While completing,
* cursor don't point original position, changing compl_leader would
* break redo. */
if (!compl_opt_refresh_always)
{
vim_free(compl_leader);
compl_leader = vim_strnsave(ml_get_curline() + compl_col,
(int)(curwin->w_cursor.col - compl_col));
if (compl_leader != NULL)
ins_compl_new_leader();
if (compl_leader != NULL)
ins_compl_new_leader();
}
}
/*
@@ -4554,6 +4560,11 @@ ins_compl_next(allow_get_expansion, count, insert_match)
int found_end = FALSE;
int advance;
/* When user complete function return -1 for findstart which is next
* time of 'always', compl_shown_match become NULL. */
if (compl_shown_match == NULL)
return -1;
if (compl_leader != NULL
&& (compl_shown_match->cp_flags & ORIGINAL_TEXT) == 0)
{

2
src/version.c
View File

@@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
404,
/**/
403,
/**/