thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.0624: overuling CONF_ARGS from the environment still does not work

Browse Source 
Problem:    Overuling CONF_ARGS from the environment still does not work. (Tony
            Mechelynck)
Solution:   Add back CONF_ARGS next to the new numbered ones.
This commit is contained in:
Bram Moolenaar
2018-12-22 17:27:15 +01:00
parent 3d1491ed23
commit 39b5d8b514
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile
View File

@@ -1932,8 +1932,8 @@ config auto/config.mk: auto/configure config.mk.in config.h.in
$(CONF_OPT_FEAT) $(CONF_TERM_LIB) \ $(CONF_OPT_FEAT) $(CONF_TERM_LIB) \
$(CONF_OPT_COMPBY) $(CONF_OPT_ACL) $(CONF_OPT_NETBEANS) \ $(CONF_OPT_COMPBY) $(CONF_OPT_ACL) $(CONF_OPT_NETBEANS) \
$(CONF_OPT_CHANNEL) $(CONF_OPT_TERMINAL) \ $(CONF_OPT_CHANNEL) $(CONF_OPT_TERMINAL) \
$(CONF_ARGS1) $(CONF_ARGS2) $(CONF_ARGS3) $(CONF_ARGS4) \ $(CONF_ARGS) $(CONF_ARGS1) $(CONF_ARGS2) $(CONF_ARGS3) \
$(CONF_ARGS5) $(CONF_ARGS6) \ $(CONF_ARGS4) $(CONF_ARGS5) $(CONF_ARGS6) \
$(CONF_OPT_MZSCHEME) $(CONF_OPT_PLTHOME) \ $(CONF_OPT_MZSCHEME) $(CONF_OPT_PLTHOME) \
$(CONF_OPT_LUA) $(CONF_OPT_LUA_PREFIX) \ $(CONF_OPT_LUA) $(CONF_OPT_LUA_PREFIX) \
$(CONF_OPT_SYSMOUSE); \ $(CONF_OPT_SYSMOUSE); \

2
src/version.c
View File

@@ -799,6 +799,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
624,
/**/ /**/
623, 623,
/**/ /**/