From 341ad7a6994f30f420411b01f3020a999a663f5f Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 9 Oct 2010 17:23:31 +0200
Subject: [PATCH] updated for version 7.3.020 Problem:    Cursor position wrong
 when joining multiple lines and             'formatoptions' contains "a".
 (Moshe Kamensky) Solution:   Adjust cursor position for skipped indent.
 (Carlo Teubner)

---
 src/ops.c             |  9 +++++----
 src/testdir/test68.in | 11 +++++++++++
 src/testdir/test68.ok |  3 +++
 src/version.c         |  2 ++
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/ops.c b/src/ops.c
index 98bd2d171..cf5d1b13c 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -4153,9 +4153,10 @@ do_join(count, insert_space, save_undo)
     int	    save_undo;
 {
     char_u	*curr = NULL;
+    char_u      *curr_start = NULL;
     char_u	*cend;
     char_u	*newp;
-    char_u	*spaces;	/* number of spaces inserte before a line */
+    char_u	*spaces;	/* number of spaces inserted before a line */
     int		endcurr1 = NUL;
     int		endcurr2 = NUL;
     int		currsize = 0;	/* size of the current line */
@@ -4181,7 +4182,7 @@ do_join(count, insert_space, save_undo)
      */
     for (t = 0; t < count; ++t)
     {
-	curr = ml_get((linenr_T)(curwin->w_cursor.lnum + t));
+	curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t));
 	if (insert_space && t > 0)
 	{
 	    curr = skipwhite(curr);
@@ -4265,10 +4266,10 @@ do_join(count, insert_space, save_undo)
 	    copy_spaces(cend, (size_t)(spaces[t]));
 	}
 	mark_col_adjust(curwin->w_cursor.lnum + t, (colnr_T)0, (linenr_T)-t,
-				 (long)(cend - newp + spaces[t]));
+			 (long)(cend - newp + spaces[t] - (curr - curr_start)));
 	if (t == 0)
 	    break;
-	curr = ml_get((linenr_T)(curwin->w_cursor.lnum + t - 1));
+	curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t - 1));
 	if (insert_space && t > 1)
 	    curr = skipwhite(curr);
 	currsize = (int)STRLEN(curr);
diff --git a/src/testdir/test68.in b/src/testdir/test68.in
index 94104c07b..8d0c501e2 100644
--- a/src/testdir/test68.in
+++ b/src/testdir/test68.in
@@ -50,6 +50,17 @@ a b
 #a b
 }
 
+STARTTEST
+/^{/+2
+:set tw& fo=a
+I^^
+ENDTEST
+
+{
+   1aa
+   2bb
+}
+
 STARTTEST
 :g/^STARTTEST/.,/^ENDTEST/d
 :1;/^Results/,$wq! test.out
diff --git a/src/testdir/test68.ok b/src/testdir/test68.ok
index 85f35cfca..aebe36436 100644
--- a/src/testdir/test68.ok
+++ b/src/testdir/test68.ok
@@ -33,3 +33,6 @@ a b
 #a b
 }
 
+
+{ 1aa ^^2bb }
+
diff --git a/src/version.c b/src/version.c
index 38a081352..6d19c82cd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    20,
 /**/
     19,
 /**/
-- 
2.40.0