summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/buffer.c12
-rw-r--r--src/version.c2
2 files changed, 14 insertions, 0 deletions
diff --git a/src/buffer.c b/src/buffer.c
index e91b7c847e..420b5ea914 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -3460,6 +3460,18 @@ build_stl_str_hl(wp, out, outlen, fmt, use_sandbox, fillchar,
prevchar_isitem = FALSE;
for (s = usefmt; *s; )
{
+ if (curitem == STL_MAX_ITEM)
+ {
+ /* There are too many items. Add the error code to the statusline
+ * to give the user a hint about what went wrong. */
+ if (p + 6 < out + outlen)
+ {
+ mch_memmove(p, " E541", (size_t)5);
+ p += 5;
+ }
+ break;
+ }
+
if (*s != NUL && *s != '%')
prevchar_isflag = prevchar_isitem = FALSE;
diff --git a/src/version.c b/src/version.c
index cbb1ac7225..97170e6274 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 121,
+/**/
120,
/**/
119,