mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-23 03:28:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

lint

Browse Source
This commit is contained in:
Yichao Zhou
2016-05-14 00:24:41 -07:00
committed by Justin M. Keyes
parent 9dc08dd692
commit 391d8ff3d8
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/nvim/screen.c
View File

@@ -3404,7 +3404,7 @@ win_line (
c = lcs_trail; c = lcs_trail;
n_attr = 1; n_attr = 1;
extra_attr = hl_attr(HLF_8); extra_attr = hl_attr(HLF_8);
saved_attr2 = char_attr; /* save current attr */ saved_attr2 = char_attr; // save current attr
mb_c = c; mb_c = c;
if (enc_utf8 && (*mb_char2len)(c) > 1) { if (enc_utf8 && (*mb_char2len)(c) > 1) {
mb_utf8 = TRUE; mb_utf8 = TRUE;
@@ -3552,7 +3552,7 @@ win_line (
c = ' '; c = ' ';
} }
lcs_eol_one = -1; lcs_eol_one = -1;
--ptr; /* put it back at the NUL */ ptr--; // put it back at the NUL
extra_attr = hl_attr(HLF_AT); extra_attr = hl_attr(HLF_AT);
n_attr = 1; n_attr = 1;
mb_c = c; mb_c = c;
@@ -3585,8 +3585,8 @@ win_line (
} }
n_attr = n_extra + 1; n_attr = n_extra + 1;
extra_attr = hl_attr(HLF_8); extra_attr = hl_attr(HLF_8);
saved_attr2 = char_attr; /* save current attr */ saved_attr2 = char_attr; // save current attr
mb_utf8 = FALSE; /* don't draw as UTF-8 */ mb_utf8 = false; // don't draw as UTF-8
} else if (VIsual_active } else if (VIsual_active
&& (VIsual_mode == Ctrl_V && (VIsual_mode == Ctrl_V
|| VIsual_mode == 'v') || VIsual_mode == 'v')
@@ -3696,9 +3696,10 @@ win_line (
did_wcol = true; did_wcol = true;
} }
/* Don't override visual selection highlighting. */ // Don't override visual selection highlighting.
if (n_attr > 0 && draw_state == WL_LINE) if (n_attr > 0 && draw_state == WL_LINE) {
char_attr = hl_combine_attr(char_attr, extra_attr); char_attr = hl_combine_attr(char_attr, extra_attr);
}
/* /*
* Handle the case where we are in column 0 but not on the first * Handle the case where we are in column 0 but not on the first
@@ -3726,13 +3727,12 @@ win_line (
mb_utf8 = TRUE; mb_utf8 = TRUE;
u8cc[0] = 0; u8cc[0] = 0;
c = 0xc0; c = 0xc0;
} else } else {
mb_utf8 = FALSE; /* don't draw as UTF-8 */ mb_utf8 = false; // don't draw as UTF-8
if (!attr_pri) {
saved_attr3 = char_attr; /* save current attr */
char_attr = hl_attr(HLF_AT); /* later copied to char_attr */
n_attr3 = 1;
} }
saved_attr3 = char_attr; // save current attr
char_attr = hl_attr(HLF_AT); // later copied to char_attr
n_attr3 = 1;
} }
/* /*