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 98bd2d1..cf5d1b1 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -4153,9 +4153,10 @@
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 @@
*/
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 @@
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);