aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 7.4.1065

Browse Source 
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.
This commit is contained in:
Bram Moolenaar 2016-01-09 14:57:47 +01:00
parent 7b877b3605
commit 25e4fcde76
9 changed files with 48 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
runtime/doc/options.txt
View File

@ -1,4 +1,4 @@
*options.txt* For Vim version 7.4. Last change: 2016 Jan 03
*options.txt* For Vim version 7.4. Last change: 2016 Jan 09
VIM REFERENCE MANUAL by Bram Moolenaar
@ -4848,13 +4848,13 @@ A jump table for the options with a short description can be found at |Q_op|.
reset this option. |-u| |--noplugin|
*'luadll'*
'luadll' string (default empty)
'luadll' string (default depends on the build)
global
{not in Vi} {only for Unix}
{not in Vi}
{only available when compiled with the |+lua/dyn|
feature}
Specifies the path of the Lua shared library instead of DYNAMIC_LUA_DLL
what was specified at compile time.
Specifies the name of the Lua shared library. The default is
DYNAMIC_LUA_DLL, which was specified at compile time.
This option cannot be set from a |modeline| or in the |sandbox|, for
security reasons.
@ -5297,7 +5297,7 @@ A jump table for the options with a short description can be found at |Q_op|.
Negative or zero value means no thread scheduling.
*'nrformats'* *'nf'*
'nrformats' 'nf' string (default "octal,hex")
'nrformats' 'nf' string (default "bin,octal,hex")
local to buffer
{not in Vi}
This defines what bases Vim will consider for numbers when using the
@ -5311,6 +5311,9 @@ A jump table for the options with a short description can be found at |Q_op|.
hex If included, numbers starting with "0x" or "0X" will be
considered to be hexadecimal. Example: Using CTRL-X on
"0x100" results in "0x0ff".
bin If included, numbers starting with "0b" or "0B" will be
considered to be binary. Example: Using CTRL-X on
"0b1000" subtracts one, resulting in "0b0111".
Numbers which simply begin with a digit in the range 1-9 are always
considered decimal. This also happens for numbers that are not
recognized as octal or hex.
@ -5565,13 +5568,13 @@ A jump table for the options with a short description can be found at |Q_op|.
this doesn't work when $INCL contains a comma or white space.
*'perldll'*
'perldll' string (default empty)
'perldll' string (default depends on the build)
global
{not in Vi} {only for Unix}
{not in Vi}
{only available when compiled with the |+perl/dyn|
feature}
Specifies the path of the Perl shared library instead of
DYNAMIC_PERL_DLL what was specified at compile time.
Specifies the name of the Perl shared library. The default is
DYNAMIC_PERL_DLL, which was specified at compile time.
This option cannot be set from a |modeline| or in the |sandbox|, for
security reasons.
@ -5702,24 +5705,24 @@ A jump table for the options with a short description can be found at |Q_op|.
|ins-completion-menu|.
*'pythondll'*
'pythondll' string (default empty)
'pythondll' string (default depends on the build)
global
{not in Vi} {only for Unix}
{not in Vi}
{only available when compiled with the |+python/dyn|
feature}
Specifies the path of the Python 2.x shared library instead of
DYNAMIC_PYTHON_DLL what was specified at compile time.
Specifies the name of the Python 2.x shared library. The default is
DYNAMIC_PYTHON_DLL, which was specified at compile time.
This option cannot be set from a |modeline| or in the |sandbox|, for
security reasons.
*'pythonthreedll'*
'pythonthreedll' string (default empty)
'pythonthreedll' string (default depends on the build)
global
{not in Vi} {only for Unix}
{not in Vi}
{only available when compiled with the |+python3/dyn|
feature}
Specifies the path of the Python 3 shared library instead of
DYNAMIC_PYTHON3_DLL what was specified at compile time.
Specifies the name of the Python 3 shared library. The default is
DYNAMIC_PYTHON3_DLL, which was specified at compile time.
This option cannot be set from a |modeline| or in the |sandbox|, for
security reasons.
@ -5943,13 +5946,13 @@ A jump table for the options with a short description can be found at |Q_op|.
The 'rightleft' option must be set for 'rightleftcmd' to take effect.
*'rubydll'*
'rubydll' string (default empty)
'rubydll' string (default: depends on the build)
global
{not in Vi} {only for Unix}
{not in Vi}
{only available when compiled with the |+ruby/dyn|
feature}
Specifies the path of the Ruby shared library instead of
DYNAMIC_RUBY_DLL what was specified at compile time.
Specifies the name of the Ruby shared library. The default is
DYNAMIC_RUBY_DLL, which was specified at compile time.
This option cannot be set from a |modeline| or in the |sandbox|, for
security reasons.

2
src/Makefile
View File

@ -2801,7 +2801,7 @@ objects/ops.o: ops.c
$(CCC) -o $@ ops.c
objects/option.o: option.c
$(CCC) -o $@ option.c
$(CCC) $(LUA_CFLAGS) $(PERL_CFLAGS) $(PYTHON_CFLAGS) $(PYTHON3_CFLAGS) $(RUBY_CFLAGS) -o $@ option.c
objects/os_beos.o: os_beos.c
$(CCC) -o $@ os_beos.c

7
src/if_lua.c
View File

@ -402,12 +402,7 @@ lua_link_init(char *libname, int verbose)
int
lua_enabled(int verbose)
{
#ifdef WIN3264
char *dll = DYNAMIC_LUA_DLL;
#else
char *dll = *p_luadll ? (char *)p_luadll : DYNAMIC_LUA_DLL;
#endif
return lua_link_init(dll, verbose) == OK;
return lua_link_init((char *)p_luadll, verbose) == OK;
}
#endif /* DYNAMIC_LUA */

7
src/if_perl.xs
View File

@ -611,12 +611,7 @@ perl_runtime_link_init(char *libname, int verbose)
perl_enabled(verbose)
int verbose;
{
#ifdef WIN3264
char *dll = DYNAMIC_PERL_DLL;
#else
char *dll = *p_perldll ? (char *)p_perldll : DYNAMIC_PERL_DLL;
#endif
return perl_runtime_link_init(dll, verbose) == OK;
return perl_runtime_link_init((char *)p_perldll, verbose) == OK;
}
#endif /* DYNAMIC_PERL */

7
src/if_python.c
View File

@ -732,12 +732,7 @@ python_runtime_link_init(char *libname, int verbose)
int
python_enabled(int verbose)
{
#ifdef WIN3264
char *dll = DYNAMIC_PYTHON_DLL;
#else
char *dll = *p_pydll ? (char *)p_pydll : DYNAMIC_PYTHON_DLL;
#endif
return python_runtime_link_init(dll, verbose) == OK;
return python_runtime_link_init((char *)p_pydll, verbose) == OK;
}
/*

7
src/if_python3.c
View File

@ -686,12 +686,7 @@ py3_runtime_link_init(char *libname, int verbose)
int
python3_enabled(int verbose)
{
#ifdef WIN3264
char *dll = DYNAMIC_PYTHON3_DLL;
#else
char *dll = *p_py3dll ? (char *)p_py3dll : DYNAMIC_PYTHON3_DLL;
#endif
return py3_runtime_link_init(dll, verbose) == OK;
return py3_runtime_link_init((char *)p_py3dll, verbose) == OK;
}
/* Load the standard Python exceptions - don't import the symbols from the

7
src/if_ruby.c
View File

@ -677,12 +677,7 @@ ruby_runtime_link_init(char *libname, int verbose)
ruby_enabled(verbose)
int verbose;
{
#ifdef WIN3264
char *dll = DYNAMIC_RUBY_DLL;
#else
char *dll = *p_rubydll ? (char *)p_rubydll : DYNAMIC_RUBY_DLL;
#endif
return ruby_runtime_link_init(dll, verbose) == OK;
return ruby_runtime_link_init((char *)p_rubydll, verbose) == OK;
}
#endif /* defined(DYNAMIC_RUBY) || defined(PROTO) */

25
src/option.c
View File

@ -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

2
src/version.c
View File

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