# HG changeset patch # User Christian Brabandt # Date 1451764804 -3600 # Node ID e583db6c4fd47df99a523a8875c4d66306fc90fa # Parent 893b97a4cd9bcc3acdb8a0eb8260feb32e45d24d commit https://github.com/vim/vim/commit/cbfe32953aea09d35d9ac7e5865c915b14e310c1 Author: Bram Moolenaar Date: Sat Jan 2 20:59:10 2016 +0100 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 --- 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 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1032, +/**/ 1031, /**/ 1030,