diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-09 14:57:47 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-09 14:57:47 +0100 |
| commit | 25e4fcde767084d1a79e0926bc301c92987c0cce (patch) | |
| tree | 2e2196f2e782cd2bd143b8ed1187697774f4a3ad /src/option.c | |
| parent | 7b877b360532713dc21a0ff3d55a76ac02eaf573 (diff) | |
patch 7.4.1065v7.4.1065
Problem: Cannot use the "dll" options on MS-Windows.
Solution: Support the options on all platforms. Use the built-in name as
the default, so that it's clear what Vim is looking for.
Diffstat (limited to 'src/option.c')
| -rw-r--r-- | src/option.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/option.c b/src/option.c index 3573211448..9e7f303276 100644 --- a/src/option.c +++ b/src/option.c @@ -1776,10 +1776,11 @@ static struct vimoption {"loadplugins", "lpl", P_BOOL|P_VI_DEF, (char_u *)&p_lpl, PV_NONE, {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, -#if defined(DYNAMIC_LUA) && !defined(WIN3264) +#if defined(DYNAMIC_LUA) {"luadll", NULL, P_STRING|P_VI_DEF|P_SECURE, (char_u *)&p_luadll, PV_NONE, - {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, + {(char_u *)DYNAMIC_LUA_DLL, (char_u *)0L} + SCRIPTID_INIT}, #endif #ifdef FEAT_GUI_MAC {"macatsui", NULL, P_BOOL|P_VI_DEF|P_RCLR, @@ -2016,10 +2017,11 @@ static struct vimoption # endif #endif (char_u *)0L} SCRIPTID_INIT}, -#if defined(DYNAMIC_PERL) && !defined(WIN3264) +#if defined(DYNAMIC_PERL) {"perldll", NULL, P_STRING|P_VI_DEF|P_SECURE, (char_u *)&p_perldll, PV_NONE, - {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, + {(char_u *)DYNAMIC_PERL_DLL, (char_u *)0L} + SCRIPTID_INIT}, #endif {"preserveindent", "pi", P_BOOL|P_VI_DEF|P_VIM, (char_u *)&p_pi, PV_PI, @@ -2126,15 +2128,17 @@ static struct vimoption (char_u *)NULL, PV_NONE, #endif {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, -#if defined(DYNAMIC_PYTHON3) && !defined(WIN3264) +#if defined(DYNAMIC_PYTHON3) {"pythonthreedll", NULL, P_STRING|P_VI_DEF|P_SECURE, (char_u *)&p_py3dll, PV_NONE, - {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, + {(char_u *)DYNAMIC_PYTHON3_DLL, (char_u *)0L} + SCRIPTID_INIT}, #endif -#if defined(DYNAMIC_PYTHON) && !defined(WIN3264) +#if defined(DYNAMIC_PYTHON) {"pythondll", NULL, P_STRING|P_VI_DEF|P_SECURE, (char_u *)&p_pydll, PV_NONE, - {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, + {(char_u *)DYNAMIC_PYTHON_DLL, (char_u *)0L} + SCRIPTID_INIT}, #endif {"quoteescape", "qe", P_STRING|P_ALLOCED|P_VI_DEF, #ifdef FEAT_TEXTOBJ @@ -2209,10 +2213,11 @@ static struct vimoption {(char_u *)NULL, (char_u *)0L} #endif SCRIPTID_INIT}, -#if defined(DYNAMIC_RUBY) && !defined(WIN3264) +#if defined(DYNAMIC_RUBY) {"rubydll", NULL, P_STRING|P_VI_DEF|P_SECURE, (char_u *)&p_rubydll, PV_NONE, - {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, + {(char_u *)DYNAMIC_RUBY_DLL, (char_u *)0L} + SCRIPTID_INIT}, #endif {"ruler", "ru", P_BOOL|P_VI_DEF|P_VIM|P_RSTAT, #ifdef FEAT_CMDL_INFO |