|
 |
da4393 |
diff --git a/src/errors.h b/src/errors.h
|
|
|
da4393 |
index 3008020..3daf1a6 100644
|
|
|
da4393 |
--- a/src/errors.h
|
|
|
da4393 |
+++ b/src/errors.h
|
|
|
da4393 |
@@ -381,3 +381,5 @@ EXTERN char e_missing_end_block[]
|
|
|
da4393 |
INIT(= N_("E1171: Missing } after inline function"));
|
|
|
da4393 |
EXTERN char e_cannot_use_default_values_in_lambda[]
|
|
|
da4393 |
INIT(= N_("E1172: Cannot use default values in a lambda"));
|
|
|
da4393 |
+EXTERN char e_resulting_text_too_long[]
|
|
|
da4393 |
+ INIT(= N_("E1240: Resulting text too long"));
|
|
|
da4393 |
diff --git a/src/indent.c b/src/indent.c
|
|
|
da4393 |
index 4f909d0..77d8b0a 100644
|
|
|
da4393 |
--- a/src/indent.c
|
|
|
da4393 |
+++ b/src/indent.c
|
|
|
da4393 |
@@ -1696,6 +1696,11 @@ ex_retab(exarg_T *eap)
|
|
|
da4393 |
if (ptr[col] == NUL)
|
|
|
da4393 |
break;
|
|
|
da4393 |
vcol += chartabsize(ptr + col, (colnr_T)vcol);
|
|
|
da4393 |
+ if (vcol >= MAXCOL)
|
|
|
da4393 |
+ {
|
|
|
da4393 |
+ emsg(_(e_resulting_text_too_long));
|
|
|
da4393 |
+ break;
|
|
|
da4393 |
+ }
|
|
|
da4393 |
if (has_mbyte)
|
|
|
da4393 |
col += (*mb_ptr2len)(ptr + col);
|
|
|
da4393 |
else
|
|
|
da4393 |
diff --git a/src/testdir/test_retab.vim b/src/testdir/test_retab.vim
|
|
|
da4393 |
index c7190aa..6133e8f 100644
|
|
|
da4393 |
--- a/src/testdir/test_retab.vim
|
|
|
da4393 |
+++ b/src/testdir/test_retab.vim
|
|
|
da4393 |
@@ -70,6 +70,8 @@ func Test_retab()
|
|
|
da4393 |
call assert_equal(" a b c ", Retab('!', 3))
|
|
|
da4393 |
call assert_equal(" a b c ", Retab('', 5))
|
|
|
da4393 |
call assert_equal(" a b c ", Retab('!', 5))
|
|
|
da4393 |
+
|
|
|
da4393 |
+ set tabstop& expandtab&
|
|
|
da4393 |
endfunc
|
|
|
da4393 |
|
|
|
da4393 |
func Test_retab_error()
|
|
|
da4393 |
@@ -80,4 +82,21 @@ func Test_retab_error()
|
|
|
da4393 |
call assert_fails('ret 80000000000000000000', 'E475:')
|
|
|
da4393 |
endfunc
|
|
|
da4393 |
|
|
|
da4393 |
+func Test_retab_endless()
|
|
|
da4393 |
+ new
|
|
|
da4393 |
+ call setline(1, "\t0\t")
|
|
|
da4393 |
+ let caught = 'no'
|
|
|
da4393 |
+ try
|
|
|
da4393 |
+ while 1
|
|
|
da4393 |
+ set ts=4000
|
|
|
da4393 |
+ retab 4
|
|
|
da4393 |
+ endwhile
|
|
|
da4393 |
+ catch /E1240/
|
|
|
da4393 |
+ let caught = 'yes'
|
|
|
da4393 |
+ endtry
|
|
|
da4393 |
+ bwipe!
|
|
|
da4393 |
+ set tabstop&
|
|
|
da4393 |
+endfunc
|
|
|
da4393 |
+
|
|
|
da4393 |
+
|
|
|
da4393 |
" vim: shiftwidth=2 sts=2 expandtab
|