Mercurial > vim

comparison src/screen.c @ 5921:df141c80ea3a v7.4.302

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <bram@vim.org>
date Thu, 22 May 2014 15:51:04 +0200
parents 662ae48e7e24
children 463ef551e9f6
comparison
equal deleted inserted replaced
5920:822f24a92ea8 5921:df141c80ea3a
3551 if (draw_state == WL_SIGN - 1 && n_extra == 0) 3551 if (draw_state == WL_SIGN - 1 && n_extra == 0)
3552 { 3552 {
3553 draw_state = WL_SIGN; 3553 draw_state = WL_SIGN;
3554 /* Show the sign column when there are any signs in this 3554 /* Show the sign column when there are any signs in this
3555 * buffer or when using Netbeans. */ 3555 * buffer or when using Netbeans. */
3556 if (draw_signcolumn(wp) 3556 if (draw_signcolumn(wp))
3557 # ifdef FEAT_DIFF
3558 && filler_todo <= 0
3559 # endif
3560 )
3561 { 3557 {
3562 int text_sign; 3558 int text_sign;
3563 # ifdef FEAT_SIGN_ICONS 3559 # ifdef FEAT_SIGN_ICONS
3564 int icon_sign; 3560 int icon_sign;
3565 # endif 3561 # endif
3567 /* Draw two cells with the sign value or blank. */ 3563 /* Draw two cells with the sign value or blank. */
3568 c_extra = ' '; 3564 c_extra = ' ';
3569 char_attr = hl_attr(HLF_SC); 3565 char_attr = hl_attr(HLF_SC);
3570 n_extra = 2; 3566 n_extra = 2;
3571 3567
3572 if (row == startrow) 3568 if (row == startrow
3569 #ifdef FEAT_DIFF
3570 + filler_lines && filler_todo <= 0
3571 #endif
3572 )
3573 { 3573 {
3574 text_sign = buf_getsigntype(wp->w_buffer, lnum, 3574 text_sign = buf_getsigntype(wp->w_buffer, lnum,
3575 SIGN_TEXT); 3575 SIGN_TEXT);
3576 # ifdef FEAT_SIGN_ICONS 3576 # ifdef FEAT_SIGN_ICONS
3577 icon_sign = buf_getsigntype(wp->w_buffer, lnum, 3577 icon_sign = buf_getsigntype(wp->w_buffer, lnum,