aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.1.0772: some missing changes from v9.1.0771

Browse Source 
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>
This commit is contained in:
glepnir 2024-10-09 20:19:25 +02:00 committed by Christian Brabandt
parent 0fe17f8ffb
commit 7baa014d0f
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/insexpand.c
View File

@ -105,8 +105,7 @@ struct compl_S
int cp_flags; // CP_ values int cp_flags; // CP_ values
int cp_number; // sequence number int cp_number; // sequence number
int cp_score; // fuzzy match score int cp_score; // fuzzy match score
int cp_user_abbr_hlattr; // highlight attribute to combine with int cp_user_abbr_hlattr; // highlight attribute for abbr
// for abbr.
int cp_user_kind_hlattr; // highlight attribute for kind int cp_user_kind_hlattr; // highlight attribute for kind
}; };

11
src/popupmenu.c
View File

@ -777,10 +777,7 @@ pum_redraw(void)
} }
if (attrs != NULL) if (attrs != NULL)
{ VIM_CLEAR(attrs);
vim_free(attrs);
attrs = NULL;
}
if (*p != TAB) if (*p != TAB)
break; break;
@ -790,14 +787,14 @@ pum_redraw(void)
if (pum_rl) if (pum_rl)
{ {
screen_puts_len((char_u *)" ", 2, row, col - 1, screen_puts_len((char_u *)" ", 2, row, col - 1,
orig_attr); attr);
col -= 2; col -= 2;
} }
else else
#endif #endif
{ {
screen_puts_len((char_u *)" ", 2, row, col, screen_puts_len((char_u *)" ", 2, row, col,
orig_attr); attr);
col += 2; col += 2;
} }
totwidth += 2; totwidth += 2;
@ -826,7 +823,7 @@ pum_redraw(void)
if (pum_rl) if (pum_rl)
{ {
screen_fill(row, row + 1, pum_col - basic_width - n + 1, screen_fill(row, row + 1, pum_col - basic_width - n + 1,
col + 1, ' ', ' ', attr); col + 1, ' ', ' ', orig_attr);
col = pum_col - basic_width - n; col = pum_col - basic_width - n;
} }
else else

2
src/structs.h
View File

@ -4474,7 +4474,7 @@ typedef struct
char_u *pum_info; // extra info char_u *pum_info; // extra info
int pum_score; // fuzzy match score int pum_score; // fuzzy match score
int pum_idx; // index of item before sorting by 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 int pum_user_kind_hlattr; // highlight attribute for kind
} pumitem_T; } pumitem_T;

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
772,
/**/ /**/
771, 771,
/**/ /**/