diff options
| -rw-r--r-- | src/indent.c | 5 | ||||
| -rw-r--r-- | src/testdir/test_retab.vim | 19 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 26 insertions, 0 deletions
diff --git a/src/indent.c b/src/indent.c index 9b137b0b42..232c534973 100644 --- a/src/indent.c +++ b/src/indent.c @@ -1750,6 +1750,11 @@ ex_retab(exarg_T *eap) if (ptr[col] == NUL) break; vcol += chartabsize(ptr + col, (colnr_T)vcol); + if (vcol >= MAXCOL) + { + emsg(_(e_resulting_text_too_long)); + break; + } if (has_mbyte) col += (*mb_ptr2len)(ptr + col); else diff --git a/src/testdir/test_retab.vim b/src/testdir/test_retab.vim index c7190aaa66..6133e8fb4a 100644 --- a/src/testdir/test_retab.vim +++ b/src/testdir/test_retab.vim @@ -70,6 +70,8 @@ func Test_retab() call assert_equal(" a b c ", Retab('!', 3)) call assert_equal(" a b c ", Retab('', 5)) call assert_equal(" a b c ", Retab('!', 5)) + + set tabstop& expandtab& endfunc func Test_retab_error() @@ -80,4 +82,21 @@ func Test_retab_error() call assert_fails('ret 80000000000000000000', 'E475:') endfunc +func Test_retab_endless() + new + call setline(1, "\t0\t") + let caught = 'no' + try + while 1 + set ts=4000 + retab 4 + endwhile + catch /E1240/ + let caught = 'yes' + endtry + bwipe! + set tabstop& +endfunc + + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index 636757c3b6..aaafadf89d 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4359, +/**/ 4358, /**/ 4357, |