diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-05-27 16:51:52 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-05-27 16:52:01 -0400 |
| commit | dcc2b25529e3e6cdd89bf7ed19e24d6a73a2e8c3 (patch) | |
| tree | bcf0f4d7be21ac0055aa1c091e96caca44046d6e /src/nvim/edit.c | |
| parent | 1b43e5c47e3887696d53573fba7fce6221888794 (diff) | |
| parent | 753401ab4cea8fc81731403fe587558e36e7388f (diff) | |
| download | rneovim-dcc2b25529e3e6cdd89bf7ed19e24d6a73a2e8c3.tar.gz rneovim-dcc2b25529e3e6cdd89bf7ed19e24d6a73a2e8c3.tar.bz2 rneovim-dcc2b25529e3e6cdd89bf7ed19e24d6a73a2e8c3.zip | |
Merge #756 'vim-patch:7.4.267'
Diffstat (limited to 'src/nvim/edit.c')
| -rw-r--r-- | src/nvim/edit.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 1dcc86b7db..bbb4ea0c03 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -7244,11 +7244,12 @@ static void ins_del(void) return; if (gchar_cursor() == NUL) { /* delete newline */ temp = curwin->w_cursor.col; - if (!can_bs(BS_EOL) /* only if "eol" included */ - || do_join(2, FALSE, TRUE, FALSE) == FAIL) + if (!can_bs(BS_EOL) // only if "eol" included + || do_join(2, FALSE, TRUE, FALSE, false) == FAIL) { vim_beep(); - else + } else { curwin->w_cursor.col = temp; + } } else if (del_char(FALSE) == FAIL) /* delete char under cursor */ vim_beep(); did_ai = FALSE; @@ -7387,7 +7388,7 @@ static int ins_bs(int c, int mode, int *inserted_space_p) ptr[len - 1] = NUL; } - (void)do_join(2, FALSE, FALSE, FALSE); + do_join(2, FALSE, FALSE, FALSE, false); if (temp == NUL && gchar_cursor() != NUL) inc_cursor(); } else |