changeset 27992:28a76008e0b1 v8.2.4521

patch 8.2.4521: build failure without the +diff feature Commit: https://github.com/vim/vim/commit/936dc6014c0132199a30e86bc33178a240f11849 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Mar 6 20:47:01 2022 +0000 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.
author Bram Moolenaar <Bram@vim.org>
date Sun, 06 Mar 2022 22:00:03 +0100
parents e8cad604c218
children cfe959a484c9
files src/drawline.c src/version.c
diffstat 2 files changed, 6 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- 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 ";
--- 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,