summaryrefslogtreecommitdiff
path: root/src/edit.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-07-10 17:51:46 +0200
committerBram Moolenaar <Bram@vim.org>2010-07-10 17:51:46 +0200
commit893eaab41fdfc2c7adc1d3ee23b41a86d335c515 (patch)
tree00325dcf0f354f681e6171529fea22b5b574fc55 /src/edit.c
parent622925875cb9d7f04a764ed8e002e45c3a141e94 (diff)
downloadvim-git-893eaab41fdfc2c7adc1d3ee23b41a86d335c515.tar.gz
Make joining a range of lines much faster. (Milan Vancura)
Diffstat (limited to 'src/edit.c')
-rw-r--r--src/edit.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/edit.c b/src/edit.c
index f465f2017..3ee76553c 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -8366,9 +8366,7 @@ ins_del()
{
temp = curwin->w_cursor.col;
if (!can_bs(BS_EOL) /* only if "eol" included */
- || u_save((linenr_T)(curwin->w_cursor.lnum - 1),
- (linenr_T)(curwin->w_cursor.lnum + 2)) == FAIL
- || do_join(FALSE) == FAIL)
+ || do_join(2, FALSE, TRUE) == FAIL)
vim_beep();
else
curwin->w_cursor.col = temp;
@@ -8549,7 +8547,7 @@ ins_bs(c, mode, inserted_space_p)
ptr[len - 1] = NUL;
}
- (void)do_join(FALSE);
+ (void)do_join(2, FALSE, FALSE);
if (temp == NUL && gchar_cursor() != NUL)
inc_cursor();
}