patch 8.1.1661: cannot build with +textprop but without +balloon_eval

Problem:    Cannot build with +textprop but without +balloon_eval.
Solution:   Adjust #ifdefs. (closes #4645)

diff --git a/src/proto.h b/src/proto.h
index 81023e27488afafef9f9f2619297ff91dc22049f..1c37bfa1833493de78d2cf30dd702324592999c9 100644 (file)
--- a/src/proto.h
+++ b/src/proto.h
@@ -230,13 +230,14 @@ void qsort(void *base, size_t elm_count, size_t elm_size, int (*cmp)(const void
 #  include "if_ruby.pro"
 # endif
 
-/* Ugly solution for "BalloonEval" not being defined while it's used in some
- * .pro files. */
-# ifdef FEAT_BEVAL
-#  include "beval.pro"
-# else
+// Ugly solution for "BalloonEval" not being defined while it's used in some
+// .pro files.
+# ifndef FEAT_BEVAL
 #  define BalloonEval int
 # endif
+# if defined(FEAT_BEVAL) || defined(FEAT_TEXT_PROP)
+#  include "beval.pro"
+# endif
 
 # ifdef FEAT_NETBEANS_INTG
 #  include "netbeans.pro"

diff --git a/src/version.c b/src/version.c
index 6af9abaaab1776eb44128ee170f47a38b4659e48..9e8fcbad01a612d5a40f89bd331a185d1f5399da 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1661,
 /**/
     1660,
 /**/