0
0
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00

patch 8.2.4521: build failure without the +diff feature

Problem:    Build failure without the +diff feature. (John Marriott)
Solution:   Define filler+lines if not declaring it.
This commit is contained in:
Bram Moolenaar
2022-03-06 20:47:01 +00:00
parent 127969cf98
commit 936dc6014c
2 changed files with 6 additions and 9 deletions

View File

@@ -354,6 +354,8 @@ win_line(
#if defined(FEAT_DIFF) || defined(FEAT_SIGNS) #if defined(FEAT_DIFF) || defined(FEAT_SIGNS)
int filler_lines = 0; // nr of filler lines to be drawn int filler_lines = 0; // nr of filler lines to be drawn
int filler_todo = 0; // nr of filler lines still to do + 1 int filler_todo = 0; // nr of filler lines still to do + 1
#else
# define filler_lines 0
#endif #endif
#ifdef FEAT_DIFF #ifdef FEAT_DIFF
hlf_T diff_hlf = (hlf_T)0; // type of diff highlighting 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 // Display the absolute or relative line number. After the
// first fill with blanks when the 'n' flag isn't in 'cpo' // first fill with blanks when the 'n' flag isn't in 'cpo'
if ((wp->w_p_nu || wp->w_p_rnu) if ((wp->w_p_nu || wp->w_p_rnu)
&& (row == startrow && (row == startrow + filler_lines
#ifdef FEAT_DIFF
+ filler_lines
#endif
|| vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) || vim_strchr(p_cpo, CPO_NUMCOL) == NULL))
{ {
#ifdef FEAT_SIGNS #ifdef FEAT_SIGNS
@@ -1127,11 +1126,7 @@ win_line(
#endif #endif
{ {
// Draw the line number (empty space after wrapping). // Draw the line number (empty space after wrapping).
if (row == startrow if (row == startrow + filler_lines)
#ifdef FEAT_DIFF
+ filler_lines
#endif
)
{ {
long num; long num;
char *fmt = "%*ld "; char *fmt = "%*ld ";

View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
4521,
/**/ /**/
4520, 4520,
/**/ /**/