From 39b5d8b514a0022899a09ba097997099d861dcff Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 22 Dec 2018 17:27:15 +0100 Subject: [PATCH] patch 8.1.0624: overuling CONF_ARGS from the environment still does not work Problem: Overuling CONF_ARGS from the environment still does not work. (Tony Mechelynck) Solution: Add back CONF_ARGS next to the new numbered ones. --- src/Makefile | 4 ++-- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile index 56e3ba61f..38bb1090d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1932,8 +1932,8 @@ config auto/config.mk: auto/configure config.mk.in config.h.in $(CONF_OPT_FEAT) $(CONF_TERM_LIB) \ $(CONF_OPT_COMPBY) $(CONF_OPT_ACL) $(CONF_OPT_NETBEANS) \ $(CONF_OPT_CHANNEL) $(CONF_OPT_TERMINAL) \ - $(CONF_ARGS1) $(CONF_ARGS2) $(CONF_ARGS3) $(CONF_ARGS4) \ - $(CONF_ARGS5) $(CONF_ARGS6) \ + $(CONF_ARGS) $(CONF_ARGS1) $(CONF_ARGS2) $(CONF_ARGS3) \ + $(CONF_ARGS4) $(CONF_ARGS5) $(CONF_ARGS6) \ $(CONF_OPT_MZSCHEME) $(CONF_OPT_PLTHOME) \ $(CONF_OPT_LUA) $(CONF_OPT_LUA_PREFIX) \ $(CONF_OPT_SYSMOUSE); \ diff --git a/src/version.c b/src/version.c index f57ffb3ff..3321974a5 100644 --- a/src/version.c +++ b/src/version.c @@ -799,6 +799,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 624, /**/ 623, /**/ -- 2.40.0