aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 7.4.1032

Browse Source 
Problem:    message from assert_false() does not look nice.
Solution:   Handle missing sourcing_name. Use right number of spaces. (Watiko)
            Don't use line number if it's zero.
This commit is contained in:
Bram Moolenaar
2016-01-02 20:59:10 +01:00
parent 3c6f92e52e
commit cbfe32953a
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/eval.c
View File

@@ -9151,10 +9151,19 @@ prepare_assert_error(gap)
char buf[NUMBUFLEN];
ga_init2(gap, 1, 100);
ga_concat(gap, sourcing_name);
sprintf(buf, " line %ld", (long)sourcing_lnum);
ga_concat(gap, (char_u *)buf);
ga_concat(gap, (char_u *)": ");
if (sourcing_name != NULL)
{
ga_concat(gap, sourcing_name);
if (sourcing_lnum > 0)
ga_concat(gap, (char_u *)" ");
}
if (sourcing_lnum > 0)
{
sprintf(buf, "line %ld", (long)sourcing_lnum);
ga_concat(gap, (char_u *)buf);
}
if (sourcing_name != NULL || sourcing_lnum > 0)
ga_concat(gap, (char_u *)": ");
}
/*
@@ -9243,7 +9252,7 @@ assert_bool(argvars, isTrue)
{
prepare_assert_error(&ga);
fill_assert_error(&ga, &argvars[1],
(char_u *)(isTrue ? "True " : "False "),
(char_u *)(isTrue ? "True" : "False"),
NULL, &argvars[0]);
assert_error(&ga);
ga_clear(&ga);

2
src/version.c
View File

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