diff options
| author | glepnir <glephunter@gmail.com> | 2024-10-09 20:19:25 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-10-09 20:19:25 +0200 |
| commit | 7baa014d0f73c3b2c6831471d047220633651238 (patch) | |
| tree | 0908f9a8e33c4aac661100a3ee0af9f4f8361dc3 | |
| parent | 0fe17f8ffbd2588ecd2bf42dced556897bc64f89 (diff) | |
patch 9.1.0772: some missing changes from v9.1.0771v9.1.0772
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>
| -rw-r--r-- | src/insexpand.c | 3 | ||||
| -rw-r--r-- | src/popupmenu.c | 11 | ||||
| -rw-r--r-- | src/structs.h | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 8 insertions, 10 deletions
diff --git a/src/insexpand.c b/src/insexpand.c index eb920a751e..c22eb6dc2f 100644 --- 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 }; diff --git a/src/popupmenu.c b/src/popupmenu.c index 90ffe0e342..4d77c666a5 100644 --- 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 diff --git a/src/structs.h b/src/structs.h index debc7df96b..da403ffe34 100644 --- 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; diff --git a/src/version.c b/src/version.c index 67c05f3ea1..37c733233e 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 772, +/**/ 771, /**/ 770, |