diff options
| author | oni-link <knil.ino@gmail.com> | 2014-05-22 16:29:35 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-06-20 02:34:39 -0400 |
| commit | c3887379577f95b0621fc47b0d0a3423079b7b03 (patch) | |
| tree | 1d432e1d193bf6fe3503f9156a8e3f9ca13297b4 | |
| parent | 02d935729f651840ee53e0cd55339c996b9789fa (diff) | |
| download | rneovim-c3887379577f95b0621fc47b0d0a3423079b7b03.tar.gz rneovim-c3887379577f95b0621fc47b0d0a3423079b7b03.tar.bz2 rneovim-c3887379577f95b0621fc47b0d0a3423079b7b03.zip | |
vim-patch:7.4.302 #817
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
| -rw-r--r-- | src/nvim/screen.c | 4 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 0dab25a21a..88e1c2dd6d 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -2741,14 +2741,14 @@ win_line ( draw_state = WL_SIGN; /* Show the sign column when there are any signs in this * buffer or when using Netbeans. */ - if (draw_signcolumn(wp) && filler_todo <= 0) { + if (draw_signcolumn(wp)) { int text_sign; /* Draw two cells with the sign value or blank. */ c_extra = ' '; char_attr = hl_attr(HLF_SC); n_extra = 2; - if (row == startrow) { + if (row == startrow + filler_lines && filler_todo <= 0) { text_sign = buf_getsigntype(wp->w_buffer, lnum, SIGN_TEXT); if (text_sign != 0) { p_extra = sign_get_text(text_sign); diff --git a/src/nvim/version.c b/src/nvim/version.c index 12dd5b5599..8816a5e3b2 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -216,7 +216,7 @@ static int included_patches[] = { //305, //304, //303, - //302, + 302, 301, //300, //299, |