diff options
| author | Shougo Matsushita <Shougo.Matsu@gmail.com> | 2015-12-13 12:52:09 +0900 |
|---|---|---|
| committer | Shougo Matsushita <Shougo.Matsu@gmail.com> | 2015-12-13 12:53:30 +0900 |
| commit | f1b9a59ed690baaf2baadec8eb2beb0df80e878f (patch) | |
| tree | ddb1df2d0f99238ada2ed43d22ea296c706ae645 /src | |
| parent | f183cc14de40542899f1bad44943695b0ccf0e5c (diff) | |
| download | rneovim-f1b9a59ed690baaf2baadec8eb2beb0df80e878f.tar.gz rneovim-f1b9a59ed690baaf2baadec8eb2beb0df80e878f.tar.bz2 rneovim-f1b9a59ed690baaf2baadec8eb2beb0df80e878f.zip | |
vim-patch:7.4.640
Problem: After deleting characters in Insert mode such that lines are
joined undo does not work properly. (issue 324)
Solution: Use Insstart instead of Insstart_orig. (Christian Brabandt)
https://github.com/vim/vim/commit/c3bbad085c3ec304b111dc95aed97fea4c38a177
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/edit.c | 7 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 8dc2844d8e..e820ea3d2b 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -7427,15 +7427,14 @@ static int ins_bs(int c, int mode, int *inserted_space_p) * delete newline! */ if (curwin->w_cursor.col == 0) { - lnum = Insstart_orig.lnum; + lnum = Insstart.lnum; if (curwin->w_cursor.lnum == lnum || revins_on) { if (u_save((linenr_T)(curwin->w_cursor.lnum - 2), (linenr_T)(curwin->w_cursor.lnum + 1)) == FAIL) { return FALSE; } - --Insstart_orig.lnum; - Insstart_orig.col = MAXCOL; - Insstart = Insstart_orig; + --Insstart.lnum; + Insstart.col = MAXCOL; } /* * In replace mode: diff --git a/src/nvim/version.c b/src/nvim/version.c index 2b0d6f22f2..a1427aaf8b 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -356,7 +356,7 @@ static int included_patches[] = { // 643, // 642, // 641, - // 640, + 640, // 639, // 638 NA 637, |