diff options
author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-10-23 13:05:19 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-23 13:05:19 -0400 |
commit | bb9e6a15834dcab2cb58afe22fedd0a4d818d9a8 (patch) | |
tree | 0367fad361ebed9832d7d9bd9018dff1a670dc39 /src/nvim/screen.c | |
parent | fa4b24072e13dc7303e896701f0bb6d0227caf0c (diff) | |
parent | e59c0009a76cee92bedf72fbd1db04e4a16ed24b (diff) | |
download | rneovim-bb9e6a15834dcab2cb58afe22fedd0a4d818d9a8.tar.gz rneovim-bb9e6a15834dcab2cb58afe22fedd0a4d818d9a8.tar.bz2 rneovim-bb9e6a15834dcab2cb58afe22fedd0a4d818d9a8.zip |
Merge pull request #16111 from dundargoc/vim-patch/comments
vim-patch:8.1.2368,8.1.2378,8.1.2379,8.1.2380,8.1.2387,8.1.2388,8.1.2392,8.1.2394,8.1.2395,8.1.2396
Diffstat (limited to 'src/nvim/screen.c')
-rw-r--r-- | src/nvim/screen.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 976b933c73..fcd428ba1b 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -694,7 +694,7 @@ void conceal_check_cursor_line(void) if (curwin->w_p_cole > 0 && (conceal_cursor_used != should_conceal)) { redrawWinline(curwin, curwin->w_cursor.lnum); // Need to recompute cursor column, e.g., when starting Visual mode - // without concealing. */ + // without concealing. curs_columns(curwin, true); } } @@ -4829,8 +4829,8 @@ static void grid_put_linebuf(ScreenGrid *grid, int row, int coloff, int endcol, } if (clear_next) { - /* Clear the second half of a double-wide character of which the left - * half was overwritten with a single-wide character. */ + // Clear the second half of a double-wide character of which the left + // half was overwritten with a single-wide character. schar_from_ascii(grid->chars[off_to], ' '); end_dirty++; } @@ -5177,9 +5177,9 @@ void win_redr_status_matches(expand_T *xp, int num_matches, char_u **matches, in } wild_menu_showing = WM_SCROLLED; } else { - /* Create status line if needed by setting 'laststatus' to 2. - * Set 'winminheight' to zero to avoid that the window is - * resized. */ + // Create status line if needed by setting 'laststatus' to 2. + // Set 'winminheight' to zero to avoid that the window is + // resized. if (lastwin->w_status_height == 0) { save_p_ls = p_ls; save_p_wmh = p_wmh; @@ -7326,8 +7326,8 @@ void draw_tabline(void) } } - /* Reset the flag here again, in case evaluating 'tabline' causes it to be - * set. */ + // Reset the flag here again, in case evaluating 'tabline' causes it to be + // set. redraw_tabline = false; } @@ -7392,9 +7392,9 @@ int fillchar_status(int *attr, win_T *wp) *attr = win_hl_attr(wp, HLF_SNC); fill = wp->w_p_fcs_chars.stlnc; } - /* Use fill when there is highlighting, and highlighting of current - * window differs, or the fillchars differ, or this is not the - * current window */ + // Use fill when there is highlighting, and highlighting of current + // window differs, or the fillchars differ, or this is not the + // current window if (*attr != 0 && ((win_hl_attr(wp, HLF_S) != win_hl_attr(wp, HLF_SNC) || !is_curwin || ONE_WINDOW) || (wp->w_p_fcs_chars.stl != wp->w_p_fcs_chars.stlnc))) { |