thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 8.2.0060: message test only runs with one encoding

Browse Source 
Problem:    Message test only runs with one encoding. (Dominique Pelle)
Solution:   Run the test with "utf-8" and "latin1".  Fix underflow. (related
            to #5410)
This commit is contained in:
Bram Moolenaar 2019-12-30 17:55:34 +01:00
parent 85b0957616
commit d0337e360e
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/message.c
View File

@ -307,7 +307,8 @@ trunc_string(
}
else
{
for (i = (int)STRLEN(s); len + (n = ptr2cells(s + i - 1)) <= room; --i)
for (i = (int)STRLEN(s);
i - 1 >= 0 && len + (n = ptr2cells(s + i - 1)) <= room; --i)
len += n;
}

8
src/message_test.c
View File

@ -100,8 +100,14 @@ main(int argc, char **argv)
params.argc = argc;
params.argv = argv;
common_init(&params);
init_chartab();
set_option_value((char_u *)"encoding", 0, (char_u *)"utf-8", 0);
init_chartab();
test_trunc_string();
set_option_value((char_u *)"encoding", 0, (char_u *)"latin1", 0);
init_chartab();
test_trunc_string();
return 0;
}

2
src/version.c
View File

@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
60,
/**/
59,
/**/