diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-09-18 17:23:47 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-09-18 17:23:47 -0400 |
| commit | fe446c86cf752961fab84f92aa4956aaa4dc3f6f (patch) | |
| tree | 8438a064a69a230a307823d6a39e79c10934f36e /src | |
| parent | e2c111384b97532d7601519e3501f480e932c0cd (diff) | |
| parent | 3b9a44fbeaef504e28120f0fdd07f438be00aec3 (diff) | |
| download | rneovim-fe446c86cf752961fab84f92aa4956aaa4dc3f6f.tar.gz rneovim-fe446c86cf752961fab84f92aa4956aaa4dc3f6f.tar.bz2 rneovim-fe446c86cf752961fab84f92aa4956aaa4dc3f6f.zip | |
Merge pull request #1196 from Shougo/vim-patch-7.4.381
vim-patch: 7.4.381
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/edit.c | 1 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index b3f4e4d449..3b450e5245 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -7267,6 +7267,7 @@ static int ins_bs(int c, int mode, int *inserted_space_p) } --Insstart_orig.lnum; Insstart_orig.col = MAXCOL; + Insstart = Insstart_orig; } /* * In replace mode: diff --git a/src/nvim/version.c b/src/nvim/version.c index aa6f94bd6c..cd4ccfa813 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -214,7 +214,7 @@ static int included_patches[] = { //384 NA //383, //382, - //381, + 381, //380 NA 379, //378, |