diff options
| author | James McCoy <jamessan@jamessan.com> | 2017-08-30 10:34:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-30 10:34:42 -0400 |
| commit | 7bfa4406c170bff95ec98548c40b7dd2b3e511c8 (patch) | |
| tree | bb1749d9685f433688b008268e4623dc3abdf987 /src | |
| parent | 5566f30006a73c30dfbdeece2e08830826d28aa4 (diff) | |
| parent | 0e13b15fde1cc02cd1bb390d161cdc13afb96e39 (diff) | |
| download | rneovim-7bfa4406c170bff95ec98548c40b7dd2b3e511c8.tar.gz rneovim-7bfa4406c170bff95ec98548c40b7dd2b3e511c8.tar.bz2 rneovim-7bfa4406c170bff95ec98548c40b7dd2b3e511c8.zip | |
Merge pull request #7227 from ckelsel/vim-8.0.0209
vim-patch:8.0.0209
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_cmds.c | 4 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index a555fb77e8..32dbf4cc69 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -3500,6 +3500,10 @@ static buf_T *do_sub(exarg_T *eap, proftime_T timeout) setmouse(); /* disable mouse in xterm */ curwin->w_cursor.col = regmatch.startpos[0].col; + if (curwin->w_p_crb) { + do_check_cursorbind(); + } + /* When 'cpoptions' contains "u" don't sync undo when * asking for confirmation. */ if (vim_strchr(p_cpo, CPO_UNDO) != NULL) diff --git a/src/nvim/version.c b/src/nvim/version.c index 53b44f8029..d7ebc26321 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -743,7 +743,7 @@ static const int included_patches[] = { // 212, // 211 NA // 210, - // 209, + 209, 208, // 207, // 206, |