diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-06-19 14:28:43 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-06-19 14:28:43 +0200 |
commit | bf8c3adef21c24a9bf2c1a93042a096ea8d8b2e1 (patch) | |
tree | 31475d16dbc52804e3b5b1a67d0dd2b3d077c810 | |
parent | 87652a7e3b94755084944afec51a0bfcd8b0a0c3 (diff) | |
download | vim-git-bf8c3adef21c24a9bf2c1a93042a096ea8d8b2e1.tar.gz |
patch 8.1.1569: cannot build with signs but without diff featurev8.1.1569
Problem: Cannot build with signs but without diff feature.
Solution: Move #ifdef. (Tom Ryder)
-rw-r--r-- | src/screen.c | 8 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/screen.c b/src/screen.c index 016355e5d..914bf37c3 100644 --- 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 */ diff --git a/src/version.c b/src/version.c index 68704cc37..7e97f9147 100644 --- a/src/version.c +++ b/src/version.c @@ -778,6 +778,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1569, +/**/ 1568, /**/ 1567, |