patch 7.4.1032
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.
diff --git a/src/eval.c b/src/eval.c
index c613f4a..743c743 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -9151,10 +9151,19 @@
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 @@
{
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 6b225b3..72aa418 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1032,
+/**/
1031,
/**/
1030,
