summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/popupmenu.c9
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 3 deletions
diff --git a/src/popupmenu.c b/src/popupmenu.c
index b267ec54a..d6993dc43 100644
--- a/src/popupmenu.c
+++ b/src/popupmenu.c
@@ -60,9 +60,12 @@ pum_compute_size(void)
pum_extra_width = 0;
for (i = 0; i < pum_size; ++i)
{
- w = vim_strsize(pum_array[i].pum_text);
- if (pum_base_width < w)
- pum_base_width = w;
+ if (pum_array[i].pum_text != NULL)
+ {
+ w = vim_strsize(pum_array[i].pum_text);
+ if (pum_base_width < w)
+ pum_base_width = w;
+ }
if (pum_array[i].pum_kind != NULL)
{
w = vim_strsize(pum_array[i].pum_kind) + 1;
diff --git a/src/version.c b/src/version.c
index 8f1539a68..29763f7f5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 678,
+/**/
677,
/**/
676,