aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.3.020

Browse Source 
Problem:    Cursor position wrong when joining multiple lines and
            'formatoptions' contains "a". (Moshe Kamensky)
Solution:   Adjust cursor position for skipped indent. (Carlo Teubner)
This commit is contained in:
Bram Moolenaar 2010-10-09 17:23:31 +02:00
parent 4a74803ef8
commit 341ad7a699
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ops.c
View File

@ -4153,9 +4153,10 @@ do_join(count, insert_space, save_undo)
int save_undo; int save_undo;
{ {
char_u *curr = NULL; char_u *curr = NULL;
char_u *curr_start = NULL;
char_u *cend; char_u *cend;
char_u *newp; 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 endcurr1 = NUL;
int endcurr2 = NUL; int endcurr2 = NUL;
int currsize = 0; /* size of the current line */ 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) 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) if (insert_space && t > 0)
{ {
curr = skipwhite(curr); curr = skipwhite(curr);
@ -4265,10 +4266,10 @@ do_join(count, insert_space, save_undo)
copy_spaces(cend, (size_t)(spaces[t])); copy_spaces(cend, (size_t)(spaces[t]));
} }
mark_col_adjust(curwin->w_cursor.lnum + t, (colnr_T)0, (linenr_T)-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) if (t == 0)
break; 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) if (insert_space && t > 1)
curr = skipwhite(curr); curr = skipwhite(curr);
currsize = (int)STRLEN(curr); currsize = (int)STRLEN(curr);

11
src/testdir/test68.in
View File

@ -50,6 +50,17 @@ a b
#a b #a b
} }
STARTTEST
/^{/+2
:set tw& fo=a
I^^
ENDTEST
{
1aa
2bb
}
STARTTEST STARTTEST
:g/^STARTTEST/.,/^ENDTEST/d :g/^STARTTEST/.,/^ENDTEST/d
:1;/^Results/,$wq! test.out :1;/^Results/,$wq! test.out

3
src/testdir/test68.ok
View File

@ -33,3 +33,6 @@ a b
#a b #a b
} }
{ 1aa ^^2bb }

2
src/version.c
View File

@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
20,
/**/ /**/
19, 19,
/**/ /**/