IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
ckelsel 2017-09-01 07:33:29 +08:00
commit 70c62d58d5
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/ex_cmds.c
View File

@ -3500,6 +3500,10 @@ static buf_T *do_sub(exarg_T *eap, proftime_T timeout)
setmouse(); /* disable mouse in xterm */ setmouse(); /* disable mouse in xterm */
curwin->w_cursor.col = regmatch.startpos[0].col; 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 /* When 'cpoptions' contains "u" don't sync undo when
* asking for confirmation. */ * asking for confirmation. */
if (vim_strchr(p_cpo, CPO_UNDO) != NULL) if (vim_strchr(p_cpo, CPO_UNDO) != NULL)

2
src/nvim/version.c
View File

@ -743,7 +743,7 @@ static const int included_patches[] = {
// 212, // 212,
// 211 NA // 211 NA
// 210, // 210,
// 209, 209,
208, 208,
// 207, // 207,
// 206, // 206,