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.

diff --git a/src/drawline.c b/src/drawline.c
index 6a5c28df1d520d751d76ac5c963dd0d1e3ddf1bd..19b0573356975800497141b6759200641f153e36 100644 (file)
--- 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 9753167ad864c364a814cf9d1b922e520eb9c291..c53f4d87f2bc7f3801ae54b93bc8471c05a30064 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4521,
 /**/
     4520,
 /**/