# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1562790604 -7200
# Node ID 066d77831630b47b848cf55eae03ba93b1d50aa9
# Parent  66db69fb9b4be9f1e24ad623c47b252903eb0bd1
patch 8.1.1661: cannot build with +textprop but without +balloon_eval

commit https://github.com/vim/vim/commit/247bf0de465411e4ebb1c0fe1a9e07f4a7f77e91
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Jul 10 22:21:48 2019 +0200

    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 https://github.com/vim/vim/issues/4645)

diff --git a/src/proto.h b/src/proto.h
--- a/src/proto.h
+++ b/src/proto.h
@@ -230,12 +230,13 @@ void qsort(void *base, size_t elm_count,
 #  include "if_ruby.pro"
 # endif
 
-/* Ugly solution for "BalloonEval" not being defined while it's used in some
- * .pro files. */
-# ifdef FEAT_BEVAL
+// 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"
-# else
-#  define BalloonEval int
 # endif
 
 # ifdef FEAT_NETBEANS_INTG
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1661,
+/**/
     1660,
 /**/
     1659,