# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1545496205 -3600
# Node ID 34f71bcceecdc12d2876dce9bfeb5e128c1cb18f
# Parent  50a6a912b94cf8e68b8d3d0e5bfa1d0520609d01
patch 8.1.0624: overuling CONF_ARGS from the environment still does not work

commit https://github.com/vim/vim/commit/39b5d8b514a0022899a09ba097997099d861dcff
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Dec 22 17:27:15 2018 +0100

    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.

diff --git a/src/Makefile b/src/Makefile
--- a/src/Makefile
+++ b/src/Makefile
@@ -1932,8 +1932,8 @@ config auto/config.mk: auto/configure co
 		$(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
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    624,
+/**/
     623,
 /**/
     622,