diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-10-08 17:41:37 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-10-08 17:41:37 +0200 |
| commit | 0ab35b279f9d64f32e99424166b047f90cb042d8 (patch) | |
| tree | 8e076a67634c9afc9a3e74393c79b85df7f37222 /src | |
| parent | 4635e11c6bd63d8be90a2d9455802c6e7bde28f5 (diff) | |
patch 8.0.1182: cannot see or change mzscheme dll namev8.0.1182
Problem: Cannot see or change mzscheme dll name.
Solution: Add 'mzschemedll' and 'mzschemegcdll'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/if_mzsch.c | 2 | ||||
| -rw-r--r-- | src/option.c | 18 | ||||
| -rw-r--r-- | src/option.h | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 25 insertions, 1 deletions
diff --git a/src/if_mzsch.c b/src/if_mzsch.c index c9c5969483..54474bd807 100644 --- a/src/if_mzsch.c +++ b/src/if_mzsch.c @@ -757,7 +757,7 @@ mzscheme_runtime_link_init(char *sch_dll, char *gc_dll, int verbose) mzscheme_enabled(int verbose) { return mzscheme_runtime_link_init( - DYNAMIC_MZSCH_DLL, DYNAMIC_MZGC_DLL, verbose) == OK; + (char *)p_mzschemedll, (char *)p_mzschemegcdll, verbose) == OK; } static void diff --git a/src/option.c b/src/option.c index 4e2b929693..2743f16071 100644 --- a/src/option.c +++ b/src/option.c @@ -2008,6 +2008,24 @@ static struct vimoption options[] = {"mousetime", "mouset", P_NUM|P_VI_DEF, (char_u *)&p_mouset, PV_NONE, {(char_u *)500L, (char_u *)0L} SCRIPTID_INIT}, + {"mzschemedll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, +#if defined(DYNAMIC_MZSCHEME) + (char_u *)&p_mzschemedll, PV_NONE, + {(char_u *)DYNAMIC_MZSCH_DLL, (char_u *)0L} +#else + (char_u *)NULL, PV_NONE, + {(char_u *)"", (char_u *)0L} +#endif + SCRIPTID_INIT}, + {"mzschemegcdll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, +#if defined(DYNAMIC_MZSCHEME) + (char_u *)&p_mzschemegcdll, PV_NONE, + {(char_u *)DYNAMIC_MZGC_DLL, (char_u *)0L} +#else + (char_u *)NULL, PV_NONE, + {(char_u *)"", (char_u *)0L} +#endif + SCRIPTID_INIT}, {"mzquantum", "mzq", P_NUM, #ifdef FEAT_MZSCHEME (char_u *)&p_mzq, PV_NONE, diff --git a/src/option.h b/src/option.h index ecd70dced9..88eadae4c8 100644 --- a/src/option.h +++ b/src/option.h @@ -662,6 +662,10 @@ EXTERN long p_mouset; /* 'mousetime' */ EXTERN int p_more; /* 'more' */ #ifdef FEAT_MZSCHEME EXTERN long p_mzq; /* 'mzquantum */ +# if defined(DYNAMIC_MZSCHEME) +EXTERN char_u *p_mzschemedll; /* 'mzschemedll' */ +EXTERN char_u *p_mzschemegcdll; /* 'mzschemegcdll' */ +# endif #endif #if defined(MSWIN) EXTERN int p_odev; /* 'opendevice' */ diff --git a/src/version.c b/src/version.c index 0ca3f055a5..ce9fda8fcf 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1182, +/**/ 1181, /**/ 1180, |