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 c613f4adbd6ea960264c98c801bdefe6443decf0..743c7436c6f3dba79ec35f94e9b47240f0ad4ea4 100644 (file)
--- 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 6b225b336c2add15224f40a59c3dcde5b0a55d9a..72aa418d54e827688388656dedee53ed474db6dc 100644 (file)
--- 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,
 /**/