diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-09-01 07:33:29 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-09-01 07:33:29 +0800 |
| commit | 70c62d58d53f8d7d213e025f3f432e6521be8680 (patch) | |
| tree | bb1749d9685f433688b008268e4623dc3abdf987 | |
| parent | 9ae353ab44724808a41794589b68c1b4339d572a (diff) | |
| parent | 7bfa4406c170bff95ec98548c40b7dd2b3e511c8 (diff) | |
| download | rneovim-70c62d58d53f8d7d213e025f3f432e6521be8680.tar.gz rneovim-70c62d58d53f8d7d213e025f3f432e6521be8680.tar.bz2 rneovim-70c62d58d53f8d7d213e025f3f432e6521be8680.zip | |
Merge remote-tracking branch 'upstream/master'
| -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, |