diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-03-06 20:47:01 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-03-06 20:47:01 +0000 |
| commit | 936dc6014c0132199a30e86bc33178a240f11849 (patch) | |
| tree | 66ded041a1f96111ddca571700f2f5071aa91fdf | |
| parent | 127969cf98000a760826ca3a0f3781a8b79522f1 (diff) | |
patch 8.2.4521: build failure without the +diff featurev8.2.4521
Problem: Build failure without the +diff feature. (John Marriott)
Solution: Define filler+lines if not declaring it.
| -rw-r--r-- | src/drawline.c | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/drawline.c b/src/drawline.c index 6a5c28df1d..19b0573356 100644 --- a/src/drawline.c +++ b/src/drawline.c @@ -354,6 +354,8 @@ win_line( #if defined(FEAT_DIFF) || defined(FEAT_SIGNS) int filler_lines = 0; // nr of filler lines to be drawn int filler_todo = 0; // nr of filler lines still to do + 1 +#else +# define filler_lines 0 #endif #ifdef FEAT_DIFF hlf_T diff_hlf = (hlf_T)0; // type of diff highlighting @@ -1107,10 +1109,7 @@ win_line( // Display the absolute or relative line number. After the // first fill with blanks when the 'n' flag isn't in 'cpo' if ((wp->w_p_nu || wp->w_p_rnu) - && (row == startrow -#ifdef FEAT_DIFF - + filler_lines -#endif + && (row == startrow + filler_lines || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) { #ifdef FEAT_SIGNS @@ -1127,11 +1126,7 @@ win_line( #endif { // Draw the line number (empty space after wrapping). - if (row == startrow -#ifdef FEAT_DIFF - + filler_lines -#endif - ) + if (row == startrow + filler_lines) { long num; char *fmt = "%*ld "; diff --git a/src/version.c b/src/version.c index 9753167ad8..c53f4d87f2 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4521, +/**/ 4520, /**/ 4519, |