mirror of
https://github.com/vim/vim.git
synced 2025-07-25 10:54:51 -04:00
updated for version 7.4.302
Problem: Signs placed with 'foldcolumn' set don't show up after filler lines. Solution: Take filler lines into account. (Olaf Dabrunz)
This commit is contained in:
parent
b42970535c
commit
bc6cf6c511
12
src/screen.c
12
src/screen.c
@ -3553,11 +3553,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
|
|||||||
draw_state = WL_SIGN;
|
draw_state = WL_SIGN;
|
||||||
/* Show the sign column when there are any signs in this
|
/* Show the sign column when there are any signs in this
|
||||||
* buffer or when using Netbeans. */
|
* buffer or when using Netbeans. */
|
||||||
if (draw_signcolumn(wp)
|
if (draw_signcolumn(wp))
|
||||||
# ifdef FEAT_DIFF
|
|
||||||
&& filler_todo <= 0
|
|
||||||
# endif
|
|
||||||
)
|
|
||||||
{
|
{
|
||||||
int text_sign;
|
int text_sign;
|
||||||
# ifdef FEAT_SIGN_ICONS
|
# ifdef FEAT_SIGN_ICONS
|
||||||
@ -3569,7 +3565,11 @@ win_line(wp, lnum, startrow, endrow, nochange)
|
|||||||
char_attr = hl_attr(HLF_SC);
|
char_attr = hl_attr(HLF_SC);
|
||||||
n_extra = 2;
|
n_extra = 2;
|
||||||
|
|
||||||
if (row == startrow)
|
if (row == startrow
|
||||||
|
#ifdef FEAT_DIFF
|
||||||
|
+ filler_lines && filler_todo <= 0
|
||||||
|
#endif
|
||||||
|
)
|
||||||
{
|
{
|
||||||
text_sign = buf_getsigntype(wp->w_buffer, lnum,
|
text_sign = buf_getsigntype(wp->w_buffer, lnum,
|
||||||
SIGN_TEXT);
|
SIGN_TEXT);
|
||||||
|
@ -734,6 +734,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 */
|
||||||
|
/**/
|
||||||
|
302,
|
||||||
/**/
|
/**/
|
||||||
301,
|
301,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user