Mercurial > vim
changeset 17139:03fbad5d6279 v8.1.1569
patch 8.1.1569: cannot build with signs but without diff feature
commit https://github.com/vim/vim/commit/bf8c3adef21c24a9bf2c1a93042a096ea8d8b2e1
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jun 19 14:28:43 2019 +0200
patch 8.1.1569: cannot build with signs but without diff feature
Problem: Cannot build with signs but without diff feature.
Solution: Move #ifdef. (Tom Ryder)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 19 Jun 2019 14:30:06 +0200 |
| parents | 7771d0e1b072 |
| children | 79404044c9e3 |
| files | src/screen.c src/version.c |
| diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/screen.c +++ b/src/screen.c @@ -3051,8 +3051,8 @@ get_sign_display_info( int wcr_attr, int row, int startrow, - int filler_lines, - int filler_todo, + int filler_lines UNUSED, + int filler_todo UNUSED, int *c_extrap, int *c_finalp, char_u *extra, @@ -3237,9 +3237,9 @@ win_line( int mb_c = 0; /* decoded multi-byte character */ int mb_utf8 = FALSE; /* screen char is UTF-8 char */ int u8cc[MAX_MCO]; /* composing UTF-8 chars */ + int filler_lines = 0; /* nr of filler lines to be drawn */ + int filler_todo = 0; /* nr of filler lines still to do + 1 */ #ifdef FEAT_DIFF - int filler_lines; /* nr of filler lines to be drawn */ - int filler_todo; /* nr of filler lines still to do + 1 */ hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ int change_start = MAXCOL; /* first col of changed area */ int change_end = -1; /* last col of changed area */