summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/evalfunc.c4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 45077f6cb..40fb9e96b 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -4561,7 +4561,9 @@ f_has(typval_T *argvars, typval_T *rettv)
if (x == TRUE && n == FALSE)
{
if (0)
- ;
+ {
+ // intentionally empty
+ }
#if defined(FEAT_BEVAL) && defined(FEAT_GUI_MSWIN)
else if (STRICMP(name, "balloon_multiline") == 0)
n = multiline_balloon_available();
diff --git a/src/version.c b/src/version.c
index 40f5b145b..bcf333b8d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 526,
+/**/
525,
/**/
524,