IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.302 #817

Browse Source 
Problem:    Signs placed with 'foldcolumn' set don't show up after filler
            lines.
Solution:   Take filler lines into account. (Olaf Dabrunz)

https://code.google.com/p/vim/source/detail?r=df141c80ea3a1ffcbf82d05c1314675231fcfa75
This commit is contained in:
oni-link 2014-05-22 16:29:35 +02:00 committed by Justin M. Keyes
parent 02d935729f
commit c388737957
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/screen.c
View File

@ -2741,14 +2741,14 @@ win_line (
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) && filler_todo <= 0) { if (draw_signcolumn(wp)) {
int text_sign; int text_sign;
/* Draw two cells with the sign value or blank. */ /* Draw two cells with the sign value or blank. */
c_extra = ' '; c_extra = ' ';
char_attr = hl_attr(HLF_SC); char_attr = hl_attr(HLF_SC);
n_extra = 2; n_extra = 2;
if (row == startrow) { if (row == startrow + filler_lines && filler_todo <= 0) {
text_sign = buf_getsigntype(wp->w_buffer, lnum, SIGN_TEXT); text_sign = buf_getsigntype(wp->w_buffer, lnum, SIGN_TEXT);
if (text_sign != 0) { if (text_sign != 0) {
p_extra = sign_get_text(text_sign); p_extra = sign_get_text(text_sign);

2
src/nvim/version.c
View File

@ -216,7 +216,7 @@ static int included_patches[] = {
//305, //305,
//304, //304,
//303, //303,
//302, 302,
301, 301,
//300, //300,
//299, //299,