mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-07 11:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-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: vim/vim#15836

7baa014d0f

Co-authored-by: glepnir <glephunter@gmail.com>
This commit is contained in:
zeertzjq
2024-10-10 06:49:37 +08:00
parent 8450752f46
commit 9612b3a905
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/insexpand.c
View File

@@ -164,7 +164,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 for abbr int cp_user_abbr_hlattr; ///< highlight attribute for abbr
int cp_user_kind_hlattr; ///< highlight attribute for kind int cp_user_kind_hlattr; ///< highlight attribute for kind
}; };

13
src/nvim/popupmenu.c
View File

@@ -733,8 +733,7 @@ void pum_redraw(void)
} }
if (attrs != NULL) { if (attrs != NULL) {
xfree(attrs); XFREE_CLEAR(attrs);
attrs = NULL;
} }
if (*p != TAB) { if (*p != TAB) {
@@ -743,10 +742,10 @@ void pum_redraw(void)
// Display two spaces for a Tab. // Display two spaces for a Tab.
if (pum_rl) { if (pum_rl) {
grid_line_puts(grid_col - 1, " ", 2, orig_attr); grid_line_puts(grid_col - 1, " ", 2, attr);
grid_col -= 2; grid_col -= 2;
} else { } else {
grid_line_puts(grid_col, " ", 2, orig_attr); grid_line_puts(grid_col, " ", 2, attr);
grid_col += 2; grid_col += 2;
} }
totwidth += 2; totwidth += 2;
@@ -777,10 +776,12 @@ void pum_redraw(void)
} }
if (pum_rl) { if (pum_rl) {
grid_line_fill(col_off - basic_width - n + 1, grid_col + 1, schar_from_ascii(' '), attr); grid_line_fill(col_off - basic_width - n + 1, grid_col + 1,
schar_from_ascii(' '), orig_attr);
grid_col = col_off - basic_width - n; grid_col = col_off - basic_width - n;
} else { } else {
grid_line_fill(grid_col, col_off + basic_width + n, schar_from_ascii(' '), orig_attr); grid_line_fill(grid_col, col_off + basic_width + n,
schar_from_ascii(' '), orig_attr);
grid_col = col_off + basic_width + n; grid_col = col_off + basic_width + n;
} }
totwidth = basic_width + n; totwidth = basic_width + n;

2
src/nvim/popupmenu.h
View File

@@ -16,7 +16,7 @@ typedef struct {
char *pum_info; ///< extra info char *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;