diff --git a/src/cindent.c b/src/cindent.c index cf18441f60..2414b3fad5 100644 --- a/src/cindent.c +++ b/src/cindent.c @@ -405,7 +405,12 @@ cin_islabel_skip(char_u **s) return FALSE; while (vim_isIDc(**s)) - (*s)++; + { + if (has_mbyte) + (*s) += (*mb_ptr2len)(*s); + else + (*s)++; + } *s = cin_skipcomment(*s); diff --git a/src/testdir/test_indent.vim b/src/testdir/test_indent.vim index 0f0f9da8be..57f5206e77 100644 --- a/src/testdir/test_indent.vim +++ b/src/testdir/test_indent.vim @@ -109,6 +109,19 @@ func Test_preproc_indent() close! endfunc +func Test_userlabel_indent() + new + call setline(1, ['{', 'label:']) + normal GV= + call assert_equal('label:', getline(2)) + + call setline(2, 'läbél:') + normal GV= + call assert_equal('läbél:', getline(2)) + + close! +endfunc + " Test for 'copyindent' func Test_copyindent() new diff --git a/src/version.c b/src/version.c index af03cd9dd5..fa05cd1741 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1190, /**/ 1189, /**/