Merge pull request #4184 from watiko/vim-7.4.732

vim-patch:7.4.732
This commit is contained in:
Justin M. Keyes 2016-02-09 02:14:38 -05:00
commit 6fbb9ceb5e
2 changed files with 10 additions and 4 deletions

View File

@ -6955,10 +6955,16 @@ static void n_opencmd(cmdarg_T *cap)
(cap->cmdchar == 'o' ? 1 : 0))
)
&& open_line(cap->cmdchar == 'O' ? BACKWARD : FORWARD,
has_format_option(FO_OPEN_COMS) ? OPENLINE_DO_COM :
0, 0)) {
if (curwin->w_p_cole > 0 && oldline != curwin->w_cursor.lnum)
has_format_option(FO_OPEN_COMS)
? OPENLINE_DO_COM : 0,
0)) {
if (curwin->w_p_cole > 0 && oldline != curwin->w_cursor.lnum) {
update_single_line(curwin, oldline);
}
if (curwin->w_p_cul) {
// force redraw of cursorline
curwin->w_valid &= ~VALID_CROW;
}
invoke_edit(cap, false, cap->cmdchar, true);
}
}

View File

@ -556,7 +556,7 @@ static int included_patches[] = {
// 735,
// 734,
// 733,
// 732,
732,
// 731 NA
// 730 NA
729,