GitHub/vim
1
0
Fork 0
mirror of https://github.com/vim/vim synced 2025-07-15 16:51:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated for version 7.4.682

Browse Source 
Problem:    The search highlighting and match highlighting replaces the
            cursorline highlighting, this doesn't look good.
Solution:   Combine the highlighting. (Yasuhiro Matsumoto)
This commit is contained in:
Bram Moolenaar
2015-03-24 18:22:41 +01:00
parent dbcf19dc49
commit 09deeb7c94
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/screen.c
View File

@ -4010,17 +4010,22 @@ win_line(wp, lnum, startrow, endrow, nochange)
/* Decide which of the highlight attributes to use. */ /* Decide which of the highlight attributes to use. */
attr_pri = TRUE; attr_pri = TRUE;
if (area_attr != 0)
char_attr = area_attr;
else if (search_attr != 0)
char_attr = search_attr;
#ifdef LINE_ATTR #ifdef LINE_ATTR
if (area_attr != 0)
char_attr = hl_combine_attr(line_attr, area_attr);
else if (search_attr != 0)
char_attr = hl_combine_attr(line_attr, search_attr);
/* Use line_attr when not in the Visual or 'incsearch' area /* Use line_attr when not in the Visual or 'incsearch' area
* (area_attr may be 0 when "noinvcur" is set). */ * (area_attr may be 0 when "noinvcur" is set). */
else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL)
|| vcol < fromcol || vcol_prev < fromcol_prev || vcol < fromcol || vcol_prev < fromcol_prev
|| vcol >= tocol)) || vcol >= tocol))
char_attr = line_attr; char_attr = line_attr;
#else
if (area_attr != 0)
char_attr = area_attr;
else if (search_attr != 0)
char_attr = search_attr;
#endif #endif
else else
{ {

2
src/version.c
View File

@ -741,6 +741,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 */
/**/
682,
/**/ /**/
681, 681,
/**/ /**/