aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 8.1.2205: sign entry structure has confusing name

Browse Source 
Problem:    Sign entry structure has confusing name.
Solution:   Rename signlist_T to sign_entry_T and prefix se_ to the fields.
This commit is contained in:
Bram Moolenaar
2019-10-24 15:00:04 +02:00
parent 8f7ab4bd1e
commit 6656c2ec4c
6 changed files with 206 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/drawline.c
View File

@@ -121,9 +121,9 @@ get_sign_display_info(
#endif
)
{
text_sign = (sattr->text != NULL) ? sattr->typenr : 0;
text_sign = (sattr->sat_text != NULL) ? sattr->sat_typenr : 0;
# ifdef FEAT_SIGN_ICONS
icon_sign = (sattr->icon != NULL) ? sattr->typenr : 0;
icon_sign = (sattr->sat_icon != NULL) ? sattr->sat_typenr : 0;
if (gui.in_use && icon_sign != 0)
{
// Use the image in this position.
@@ -158,7 +158,7 @@ get_sign_display_info(
# endif
if (text_sign != 0)
{
*pp_extra = sattr->text;
*pp_extra = sattr->sat_text;
if (*pp_extra != NULL)
{
if (nrcol)
@@ -176,7 +176,7 @@ get_sign_display_info(
*c_finalp = NUL;
*n_extrap = (int)STRLEN(*pp_extra);
}
*char_attrp = sattr->texthl;
*char_attrp = sattr->sat_texthl;
}
}
}
@@ -597,7 +597,8 @@ win_line(
}
// Check if the character under the cursor should not be inverted
if (!highlight_match && lnum == curwin->w_cursor.lnum && wp == curwin
if (!highlight_match && lnum == curwin->w_cursor.lnum
&& wp == curwin
#ifdef FEAT_GUI
&& !gui.in_use
#endif
@@ -677,7 +678,7 @@ win_line(
# ifdef FEAT_SIGNS
// If this line has a sign with line highlighting set line_attr.
if (sign_present)
line_attr = sattr.linehl;
line_attr = sattr.sat_linehl;
# endif
# if defined(FEAT_QUICKFIX)
// Highlight the current line in the quickfix window.