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)

diff --git a/src/ops.c b/src/ops.c
index 98bd2d171aa7f54cc12255c87882a9d1502326bb..cf5d1b13c1c8b4b4ef6e24f47430c6b648493e34 100644 (file)
--- 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 94104c07bd4cbf583c232b5f02763eedeab69bbb..8d0c501e2a0a03c693c729057874094ed888bdda 100644 (file)
--- 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^^\e
+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 85f35cfca149f1c31e341654cc971319f67efb9b..aebe364363129a68a6bc3f0b1e7014d346fb053a 100644 (file)
--- 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 38a081352ce4eb49713da56fe1fd1c82b74c4d26..6d19c82cdb605b2e4c68506d5682bc5a8c90a13f 100644 (file)
--- 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,
 /**/