diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-10-24 15:00:04 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-10-24 15:00:04 +0200 |
| commit | 6656c2ec4cc2163cd0a51d617f429ad7fb46d2d5 (patch) | |
| tree | 5bfaaa025cce6e913ca0f5f47230011ab8908d26 /src/drawline.c | |
| parent | 8f7ab4bd1e66fd532bdef6559502d961f03b54d8 (diff) | |
patch 8.1.2205: sign entry structure has confusing namev8.1.2205
Problem: Sign entry structure has confusing name.
Solution: Rename signlist_T to sign_entry_T and prefix se_ to the fields.
Diffstat (limited to 'src/drawline.c')
| -rw-r--r-- | src/drawline.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/drawline.c b/src/drawline.c index ac37928427..869bdaa0ef 100644 --- a/src/drawline.c +++ b/src/drawline.c @@ -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. |