Skip to content

Commit

Permalink
patch 8.2.3369: auto formatting after "cw" leaves cursor in wrong spot
Browse files Browse the repository at this point in the history
Problem:    Auto formatting after "cw" leaves cursor in wrong spot.
Solution:   Do not auto-format after the delete. (closes #8789)
  • Loading branch information
brammool committed Aug 23, 2021
1 parent 9cd91a1 commit 6b36d2a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -942,7 +942,8 @@ op_delete(oparg_T *oap)
curwin->w_cursor = curpos; // restore curwin->w_cursor
(void)do_join(2, FALSE, FALSE, FALSE, FALSE);
}
auto_format(FALSE, TRUE);
if (oap->op_type == OP_DELETE)
auto_format(FALSE, TRUE);
}

msgmore(curbuf->b_ml.ml_line_count - old_lcount);
Expand Down Expand Up @@ -1809,6 +1810,7 @@ op_change(oparg_T *oap)
vim_free(ins_text);
}
}
auto_format(FALSE, TRUE);

return retval;
}
Expand Down
7 changes: 7 additions & 0 deletions src/testdir/test_textformat.vim
Original file line number Diff line number Diff line change
Expand Up @@ -967,6 +967,13 @@ func Test_fo_a_w()
exe "normal f4xx"
call assert_equal(['1 2 5 6 7 ', '8 9'], getline(1, 2))

" using "cw" leaves cursor in right spot
call setline(1, ['Now we g whether that nation, or',
\ 'any nation so conceived and,'])
set fo=tcqa tw=35
exe "normal 2G0cwx\<Esc>"
call assert_equal(['Now we g whether that nation, or x', 'nation so conceived and,'], getline(1, 2))

set tw=0
set fo&
%bw!
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -755,6 +755,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
3369,
/**/
3368,
/**/
Expand Down

0 comments on commit 6b36d2a

Please sign in to comment.