diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2020-05-05 23:38:15 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-05 23:38:15 -0400 |
commit | f04a9a2c9aa68f98a79b8d7e9917719a8be6049b (patch) | |
tree | 4cd229a5856e1dfb1ad42bcf7e9ea3e0fb07f3dd /src/nvim/popupmnu.c | |
parent | d2766b06c8fc50d06765c5c607744cc6b5f5ef0a (diff) | |
parent | ed4df85f6bae488d763b5d0eebbf2db9da25551d (diff) | |
download | rneovim-f04a9a2c9aa68f98a79b8d7e9917719a8be6049b.tar.gz rneovim-f04a9a2c9aa68f98a79b8d7e9917719a8be6049b.tar.bz2 rneovim-f04a9a2c9aa68f98a79b8d7e9917719a8be6049b.zip |
Merge #12203 from janlazo/vim-8.2.0648
vim-patch:8.1.{800,868,1581},8.2.{648,649,663,678,681,688,691,692}
Diffstat (limited to 'src/nvim/popupmnu.c')
-rw-r--r-- | src/nvim/popupmnu.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/nvim/popupmnu.c b/src/nvim/popupmnu.c index 532bf68190..e06433892d 100644 --- a/src/nvim/popupmnu.c +++ b/src/nvim/popupmnu.c @@ -63,9 +63,12 @@ static void pum_compute_size(void) pum_kind_width = 0; pum_extra_width = 0; for (int i = 0; i < pum_size; i++) { - int w = vim_strsize(pum_array[i].pum_text); - if (pum_base_width < w) { - pum_base_width = w; + int 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; |