commit 893eaab41fdfc2c7adc1d3ee23b41a86d335c515
author Bram Moolenaar <Bram@vim.org> Sat Jul 10 17:51:46 2010 +0200
committer Bram Moolenaar <Bram@vim.org> Sat Jul 10 17:51:46 2010 +0200
tree 00325dcf0f354f681e6171529fea22b5b574fc55
parent 622925875cb9d7f04a764ed8e002e45c3a141e94

Make joining a range of lines much faster. (Milan Vancura)

src/edit.c

diff --git a/src/edit.c b/src/edit.c
index f465f20..3ee7655 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -8366,9 +8366,7 @@
     {
 	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 @@
 			ptr[len - 1] = NUL;
 		}
 
-		(void)do_join(FALSE);
+		(void)do_join(2, FALSE, FALSE);
 		if (temp == NUL && gchar_cursor() != NUL)
 		    inc_cursor();
 	    }