diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-02-09 02:14:38 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-02-09 02:14:38 -0500 |
| commit | 6fbb9ceb5e123cef5a3a8f1bcf48e05a62749bba (patch) | |
| tree | 20c42e13a05d43f27e45583e056f134e5e44fbd1 /src | |
| parent | 7c2b2ea9c93d8ecce433edd22488d8222d5496fb (diff) | |
| parent | 8b2b9b83b76fe419b5075c6d7c710355c8dd3306 (diff) | |
| download | rneovim-6fbb9ceb5e123cef5a3a8f1bcf48e05a62749bba.tar.gz rneovim-6fbb9ceb5e123cef5a3a8f1bcf48e05a62749bba.tar.bz2 rneovim-6fbb9ceb5e123cef5a3a8f1bcf48e05a62749bba.zip | |
Merge pull request #4184 from watiko/vim-7.4.732
vim-patch:7.4.732
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/normal.c | 12 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 4458c8bd5b..049d650f86 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -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); } } diff --git a/src/nvim/version.c b/src/nvim/version.c index 6a79040c52..0ebc1f6a7c 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -556,7 +556,7 @@ static int included_patches[] = { // 735, // 734, // 733, - // 732, + 732, // 731 NA // 730 NA 729, |