thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.2109

Browse Source 
Problem:    Setting 'display' to "lastline" is a drastic change, while
            omitting it results in lots of "@" lines.
Solution:   Add "truncate" to show "@@@" for a truncated line.
This commit is contained in:
Bram Moolenaar
2016-07-27 23:26:04 +02:00
parent adfc5c2f9c
commit ad9c2a08f0
4 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/screen.c
View File

@@ -2018,7 +2018,7 @@ win_update(win_T *wp)
&& wp->w_lines[idx].wl_valid
&& wp->w_lines[idx].wl_lnum == lnum
&& lnum > wp->w_topline
&& !(dy_flags & DY_LASTLINE)
&& !(dy_flags & (DY_LASTLINE | DY_TRUNCATE))
&& srow + wp->w_lines[idx].wl_size > wp->w_height
#ifdef FEAT_DIFF
&& diff_check_fill(wp, lnum) == 0
@@ -2139,6 +2139,21 @@ win_update(win_T *wp)
wp->w_filler_rows = wp->w_height - srow;
}
#endif
else if (dy_flags & DY_TRUNCATE) /* 'display' has "truncate" */
{
int scr_row = W_WINROW(wp) + wp->w_height - 1;
/*
* Last line isn't finished: Display "@@@" in the last screen line.
*/
screen_puts_len((char_u *)"@@", 2, scr_row, W_WINCOL(wp),
hl_attr(HLF_AT));
screen_fill(scr_row, scr_row + 1,
(int)W_WINCOL(wp) + 2, (int)W_ENDCOL(wp),
'@', ' ', hl_attr(HLF_AT));
set_empty_rows(wp, srow);
wp->w_botline = lnum;
}
else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */
{
/*