diff --git a/src/proto.h b/src/proto.h index 81023e274..1c37bfa18 100644 --- 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 6af9abaaa..9e8fcbad0 100644 --- 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, /**/