patch 8.2.2326: build error with +eval feature but without +spell

brammool · brammool · commit 086ae0686207 · 2021-01-10T22:56:36.000+01:00
Problem:    Build error with +eval feature but without +spell.
Solution:   Adjust #ifdef. (John Marriott)
diff --git a/src/mbyte.c b/src/mbyte.c
@@ -4299,7 +4299,7 @@ mb_charlen(char_u *str)
     return count;
 }
 
-#if defined(FEAT_SPELL) || defined(PROTO)
+#if (defined(FEAT_SPELL) || defined(FEAT_EVAL)) || defined(PROTO)
 /*
  * Like mb_charlen() but for a string with specified length.
  */
diff --git 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 */
+/**/
+    2326,
 /**/
     2325,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -4299,7 +4299,7 @@ mb_charlen(char_u *str)`
`4299`	`4299`	`return count;`
`4300`	`4300`	`}`
`4301`	`4301`
`4302`		`-#if defined(FEAT_SPELL) \|\| defined(PROTO)`
	`4302`	`+#if (defined(FEAT_SPELL) \|\| defined(FEAT_EVAL)) \|\| defined(PROTO)`
`4303`	`4303`	`/*`
`4304`	`4304`	`* Like mb_charlen() but for a string with specified length.`
`4305`	`4305`	`*/`