aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-13 06:54:15 -04:00
Code Activity

patch 9.1.0477: block_editing errors out when using <enter>

Browse Source 
Problem:  block_editing errors out when using <enter>
          (Ali Rizvi-Santiago, after v9.1.0274)
Solution: Change ins_len from size_t to int so that the test
          if ins_len is negative actually works properly

Add a test, so that this doesn't regress.

fixes: #14960

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt
2024-06-11 20:30:14 +02:00
parent 959c3c887b
commit 1fb9eae579
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ops.c
View File

@@ -1814,7 +1814,7 @@ op_change(oparg_T *oap)
*/ */
if (oap->block_mode && oap->start.lnum != oap->end.lnum && !got_int) if (oap->block_mode && oap->start.lnum != oap->end.lnum && !got_int)
{ {
size_t ins_len; int ins_len;
// Auto-indenting may have changed the indent. If the cursor was past // Auto-indenting may have changed the indent. If the cursor was past
// the indent, exclude that indent change from the inserted text. // the indent, exclude that indent change from the inserted text.
@@ -1827,7 +1827,7 @@ op_change(oparg_T *oap)
bd.textcol += new_indent - pre_indent; bd.textcol += new_indent - pre_indent;
} }
ins_len = ml_get_len(oap->start.lnum) - pre_textlen; ins_len = (int)ml_get_len(oap->start.lnum) - pre_textlen;
if (ins_len > 0) if (ins_len > 0)
{ {
// Subsequent calls to ml_get() flush the firstline data - take a // Subsequent calls to ml_get() flush the firstline data - take a

9
src/testdir/test_visual.vim
View File

@@ -2705,4 +2705,13 @@ func Test_visual_block_cursor_delete()
bwipe! bwipe!
endfunc endfunc
func Test_visual_block_cursor_insert_enter()
new
call setline(1, ['asdf asdf', 'asdf asdf', 'asdf asdf', 'asdf asdf'])
call cursor(1, 5)
exe ":norm! \<c-v>3jcw\<cr>"
call assert_equal(['asdfw', 'asdf', 'asdfasdf', 'asdfasdf', 'asdfasdf'], getline(1, '$'))
bwipe!
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab

2
src/version.c
View File

@@ -704,6 +704,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 */
/**/
477,
/**/ /**/
476, 476,
/**/ /**/