Mercurial > vim

comparison src/drawline.c @ 18422:1848b3e07266 v8.1.2205

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.2205: sign entry structure has confusing name Commit: https://github.com/vim/vim/commit/6656c2ec4cc2163cd0a51d617f429ad7fb46d2d5 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Oct 24 15:00:04 2019 +0200 patch 8.1.2205: sign entry structure has confusing name Problem: Sign entry structure has confusing name. Solution: Rename signlist_T to sign_entry_T and prefix se_ to the fields.
author Bram Moolenaar <Bram@vim.org>
date Thu, 24 Oct 2019 15:15:04 +0200
parents c34ee31d0878
children b9cf60801963
comparison
equal deleted inserted replaced
18421:bf9c90b6a79b 18422:1848b3e07266
119 #ifdef FEAT_DIFF 119 #ifdef FEAT_DIFF
120 + filler_lines && filler_todo <= 0 120 + filler_lines && filler_todo <= 0
121 #endif 121 #endif
122 ) 122 )
123 { 123 {
124 text_sign = (sattr->text != NULL) ? sattr->typenr : 0; 124 text_sign = (sattr->sat_text != NULL) ? sattr->sat_typenr : 0;
125 # ifdef FEAT_SIGN_ICONS 125 # ifdef FEAT_SIGN_ICONS
126 icon_sign = (sattr->icon != NULL) ? sattr->typenr : 0; 126 icon_sign = (sattr->sat_icon != NULL) ? sattr->sat_typenr : 0;
127 if (gui.in_use && icon_sign != 0) 127 if (gui.in_use && icon_sign != 0)
128 { 128 {
129 // Use the image in this position. 129 // Use the image in this position.
130 if (nrcol) 130 if (nrcol)
131 { 131 {
156 } 156 }
157 else 157 else
158 # endif 158 # endif
159 if (text_sign != 0) 159 if (text_sign != 0)
160 { 160 {
161 *pp_extra = sattr->text; 161 *pp_extra = sattr->sat_text;
162 if (*pp_extra != NULL) 162 if (*pp_extra != NULL)
163 { 163 {
164 if (nrcol) 164 if (nrcol)
165 { 165 {
166 int n, width = number_width(wp) - 2; 166 int n, width = number_width(wp) - 2;
174 } 174 }
175 *c_extrap = NUL; 175 *c_extrap = NUL;
176 *c_finalp = NUL; 176 *c_finalp = NUL;
177 *n_extrap = (int)STRLEN(*pp_extra); 177 *n_extrap = (int)STRLEN(*pp_extra);
178 } 178 }
179 *char_attrp = sattr->texthl; 179 *char_attrp = sattr->sat_texthl;
180 } 180 }
181 } 181 }
182 } 182 }
183 #endif 183 #endif
184 184
595 } 595 }
596 } 596 }
597 } 597 }
598 598
599 // Check if the character under the cursor should not be inverted 599 // Check if the character under the cursor should not be inverted
600 if (!highlight_match && lnum == curwin->w_cursor.lnum && wp == curwin 600 if (!highlight_match && lnum == curwin->w_cursor.lnum
601 && wp == curwin
601 #ifdef FEAT_GUI 602 #ifdef FEAT_GUI
602 && !gui.in_use 603 && !gui.in_use
603 #endif 604 #endif
604 ) 605 )
605 noinvcur = TRUE; 606 noinvcur = TRUE;
675 676
676 #ifdef LINE_ATTR 677 #ifdef LINE_ATTR
677 # ifdef FEAT_SIGNS 678 # ifdef FEAT_SIGNS
678 // If this line has a sign with line highlighting set line_attr. 679 // If this line has a sign with line highlighting set line_attr.
679 if (sign_present) 680 if (sign_present)
680 line_attr = sattr.linehl; 681 line_attr = sattr.sat_linehl;
681 # endif 682 # endif
682 # if defined(FEAT_QUICKFIX) 683 # if defined(FEAT_QUICKFIX)
683 // Highlight the current line in the quickfix window. 684 // Highlight the current line in the quickfix window.
684 if (bt_quickfix(wp->w_buffer) && qf_current_entry(wp) == lnum) 685 if (bt_quickfix(wp->w_buffer) && qf_current_entry(wp) == lnum)
685 line_attr = HL_ATTR(HLF_QFL); 686 line_attr = HL_ATTR(HLF_QFL);