Mercurial > vim
changeset 36283:675810c02028 draft v9.1.0772
patch 9.1.0772: some missing changes from v9.1.0771
Commit: https://github.com/vim/vim/commit/7baa014d0f73c3b2c6831471d047220633651238
Author: glepnir <glephunter@gmail.com>
Date: Wed Oct 9 20:19:25 2024 +0200
patch 9.1.0772: some missing changes from v9.1.0771
Problem: some missing changes from v9.1.0771
Solution: use correct highlighting attribute and adjust comments
(glepnir)
closes: #15836
Signed-off-by: glepnir <glephunter@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 09 Oct 2024 20:30:09 +0200 |
| parents | eabb9dc03fb0 |
| children | 5863b2223268 |
| files | src/insexpand.c src/popupmenu.c src/structs.h src/version.c |
| diffstat | 4 files changed, 8 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/insexpand.c +++ b/src/insexpand.c @@ -105,8 +105,7 @@ struct compl_S int cp_flags; // CP_ values int cp_number; // sequence number int cp_score; // fuzzy match score - int cp_user_abbr_hlattr; // highlight attribute to combine with - // for abbr. + int cp_user_abbr_hlattr; // highlight attribute for abbr int cp_user_kind_hlattr; // highlight attribute for kind };
--- a/src/popupmenu.c +++ b/src/popupmenu.c @@ -777,10 +777,7 @@ pum_redraw(void) } if (attrs != NULL) - { - vim_free(attrs); - attrs = NULL; - } + VIM_CLEAR(attrs); if (*p != TAB) break; @@ -790,14 +787,14 @@ pum_redraw(void) if (pum_rl) { screen_puts_len((char_u *)" ", 2, row, col - 1, - orig_attr); + attr); col -= 2; } else #endif { screen_puts_len((char_u *)" ", 2, row, col, - orig_attr); + attr); col += 2; } totwidth += 2; @@ -826,7 +823,7 @@ pum_redraw(void) if (pum_rl) { screen_fill(row, row + 1, pum_col - basic_width - n + 1, - col + 1, ' ', ' ', attr); + col + 1, ' ', ' ', orig_attr); col = pum_col - basic_width - n; } else
--- a/src/structs.h +++ b/src/structs.h @@ -4474,7 +4474,7 @@ typedef struct char_u *pum_info; // extra info int pum_score; // fuzzy match score int pum_idx; // index of item before sorting by score - int pum_user_abbr_hlattr; // highlight attribute to combine with + int pum_user_abbr_hlattr; // highlight attribute for abbr int pum_user_kind_hlattr; // highlight attribute for kind } pumitem_T;