IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1236 from atwupack/vp-7.4.391

Browse Source 
vim-patch:7.4.391
This commit is contained in:
Justin M. Keyes 2014-09-26 15:57:50 -04:00
commit d41eb83019
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/nvim/screen.c
View File

@ -2830,9 +2830,12 @@ win_line (
if (wp->w_p_bri && n_extra == 0 && row != startrow && filler_lines == 0) { if (wp->w_p_bri && n_extra == 0 && row != startrow && filler_lines == 0) {
char_attr = 0; // was: hl_attr(HLF_AT); char_attr = 0; // was: hl_attr(HLF_AT);
if (diff_hlf != (hlf_T)0) if (diff_hlf != (hlf_T)0) {
char_attr = hl_attr(diff_hlf); char_attr = hl_attr(diff_hlf);
if (wp->w_p_cul && lnum == wp->w_cursor.lnum) {
char_attr = hl_combine_attr(char_attr, hl_attr(HLF_CUL));
}
}
p_extra = NULL; p_extra = NULL;
c_extra = ' '; c_extra = ' ';
n_extra = get_breakindent_win(wp, ml_get_buf(wp->w_buffer, lnum, FALSE)); n_extra = get_breakindent_win(wp, ml_get_buf(wp->w_buffer, lnum, FALSE));
@ -2869,8 +2872,9 @@ win_line (
if (tocol == vcol) if (tocol == vcol)
tocol += n_extra; tocol += n_extra;
/* combine 'showbreak' with 'cursorline' */ /* combine 'showbreak' with 'cursorline' */
if (wp->w_p_cul && lnum == wp->w_cursor.lnum) if (wp->w_p_cul && lnum == wp->w_cursor.lnum) {
char_attr = hl_combine_attr(char_attr, HLF_CLN); char_attr = hl_combine_attr(char_attr, hl_attr(HLF_CUL));
}
} }
} }
@ -3016,6 +3020,9 @@ win_line (
&& n_extra == 0) && n_extra == 0)
diff_hlf = HLF_CHD; /* changed line */ diff_hlf = HLF_CHD; /* changed line */
line_attr = hl_attr(diff_hlf); line_attr = hl_attr(diff_hlf);
if (wp->w_p_cul && lnum == wp->w_cursor.lnum) {
line_attr = hl_combine_attr(line_attr, hl_attr(HLF_CUL));
}
} }
/* Decide which of the highlight attributes to use. */ /* Decide which of the highlight attributes to use. */
@ -3620,8 +3627,12 @@ win_line (
char_attr = line_attr; char_attr = line_attr;
if (diff_hlf == HLF_TXD) { if (diff_hlf == HLF_TXD) {
diff_hlf = HLF_CHD; diff_hlf = HLF_CHD;
if (attr == 0 || char_attr != attr) if (attr == 0 || char_attr != attr) {
char_attr = hl_attr(diff_hlf); char_attr = hl_attr(diff_hlf);
if (wp->w_p_cul && lnum == wp->w_cursor.lnum) {
char_attr = hl_combine_attr(char_attr, hl_attr(HLF_CUL));
}
}
} }
} }
} }
@ -7724,8 +7735,7 @@ static void draw_tabline(void)
if (col + len >= Columns - 3) if (col + len >= Columns - 3)
break; break;
screen_puts_len(NameBuff, len, 0, col, screen_puts_len(NameBuff, len, 0, col,
hl_combine_attr(attr, hl_attr(HLF_T)) hl_combine_attr(attr, hl_attr(HLF_T)));
);
col += len; col += len;
} }
if (modified) if (modified)

2
src/nvim/version.c
View File

@ -237,7 +237,7 @@ static int included_patches[] = {
//394, //394,
//393, //393,
392, 392,
//391, 391,
//390, //390,
//389, //389,
388, 388,