diff --git a/src/eval.c b/src/eval.c index c613f4adbd..743c7436c6 100644 --- a/src/eval.c +++ b/src/eval.c @@ -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); diff --git a/src/version.c b/src/version.c index 6b225b336c..72aa418d54 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1032, /**/ 1031, /**/