Skip to content

Commit 25e4fcd

Browse files
brammoolbrammool
committed
patch 7.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.
1 parent 7b877b3 commit 25e4fcd

9 files changed

Lines changed: 48 additions & 63 deletions

File tree

‎runtime/doc/options.txt‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 7.4. Last change: 2016 Jan 03
1+
*options.txt* For Vim version 7.4. Last change: 2016 Jan 09
22

33

44
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|.
48484848
reset this option. |-u| |--noplugin|
48494849

48504850
*'luadll'*
4851-
'luadll' string (default empty)
4851+
'luadll' string (default depends on the build)
48524852
global
4853-
{not in Vi} {only for Unix}
4853+
{not in Vi}
48544854
{only available when compiled with the |+lua/dyn|
48554855
feature}
4856-
Specifies the path of the Lua shared library instead of DYNAMIC_LUA_DLL
4857-
what was specified at compile time.
4856+
Specifies the name of the Lua shared library. The default is
4857+
DYNAMIC_LUA_DLL, which was specified at compile time.
48584858
This option cannot be set from a |modeline| or in the |sandbox|, for
48594859
security reasons.
48604860

@@ -5297,7 +5297,7 @@ A jump table for the options with a short description can be found at |Q_op|.
52975297
Negative or zero value means no thread scheduling.
52985298

52995299
*'nrformats'* *'nf'*
5300-
'nrformats' 'nf' string (default "octal,hex")
5300+
'nrformats' 'nf' string (default "bin,octal,hex")
53015301
local to buffer
53025302
{not in Vi}
53035303
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|.
53115311
hex If included, numbers starting with "0x" or "0X" will be
53125312
considered to be hexadecimal. Example: Using CTRL-X on
53135313
"0x100" results in "0x0ff".
5314+
bin If included, numbers starting with "0b" or "0B" will be
5315+
considered to be binary. Example: Using CTRL-X on
5316+
"0b1000" subtracts one, resulting in "0b0111".
53145317
Numbers which simply begin with a digit in the range 1-9 are always
53155318
considered decimal. This also happens for numbers that are not
53165319
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|.
55655568
this doesn't work when $INCL contains a comma or white space.
55665569

55675570
*'perldll'*
5568-
'perldll' string (default empty)
5571+
'perldll' string (default depends on the build)
55695572
global
5570-
{not in Vi} {only for Unix}
5573+
{not in Vi}
55715574
{only available when compiled with the |+perl/dyn|
55725575
feature}
5573-
Specifies the path of the Perl shared library instead of
5574-
DYNAMIC_PERL_DLL what was specified at compile time.
5576+
Specifies the name of the Perl shared library. The default is
5577+
DYNAMIC_PERL_DLL, which was specified at compile time.
55755578
This option cannot be set from a |modeline| or in the |sandbox|, for
55765579
security reasons.
55775580

@@ -5702,24 +5705,24 @@ A jump table for the options with a short description can be found at |Q_op|.
57025705
|ins-completion-menu|.
57035706

57045707
*'pythondll'*
5705-
'pythondll' string (default empty)
5708+
'pythondll' string (default depends on the build)
57065709
global
5707-
{not in Vi} {only for Unix}
5710+
{not in Vi}
57085711
{only available when compiled with the |+python/dyn|
57095712
feature}
5710-
Specifies the path of the Python 2.x shared library instead of
5711-
DYNAMIC_PYTHON_DLL what was specified at compile time.
5713+
Specifies the name of the Python 2.x shared library. The default is
5714+
DYNAMIC_PYTHON_DLL, which was specified at compile time.
57125715
This option cannot be set from a |modeline| or in the |sandbox|, for
57135716
security reasons.
57145717

57155718
*'pythonthreedll'*
5716-
'pythonthreedll' string (default empty)
5719+
'pythonthreedll' string (default depends on the build)
57175720
global
5718-
{not in Vi} {only for Unix}
5721+
{not in Vi}
57195722
{only available when compiled with the |+python3/dyn|
57205723
feature}
5721-
Specifies the path of the Python 3 shared library instead of
5722-
DYNAMIC_PYTHON3_DLL what was specified at compile time.
5724+
Specifies the name of the Python 3 shared library. The default is
5725+
DYNAMIC_PYTHON3_DLL, which was specified at compile time.
57235726
This option cannot be set from a |modeline| or in the |sandbox|, for
57245727
security reasons.
57255728

@@ -5943,13 +5946,13 @@ A jump table for the options with a short description can be found at |Q_op|.
59435946
The 'rightleft' option must be set for 'rightleftcmd' to take effect.
59445947

59455948
*'rubydll'*
5946-
'rubydll' string (default empty)
5949+
'rubydll' string (default: depends on the build)
59475950
global
5948-
{not in Vi} {only for Unix}
5951+
{not in Vi}
59495952
{only available when compiled with the |+ruby/dyn|
59505953
feature}
5951-
Specifies the path of the Ruby shared library instead of
5952-
DYNAMIC_RUBY_DLL what was specified at compile time.
5954+
Specifies the name of the Ruby shared library. The default is
5955+
DYNAMIC_RUBY_DLL, which was specified at compile time.
59535956
This option cannot be set from a |modeline| or in the |sandbox|, for
59545957
security reasons.
59555958

‎src/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2801,7 +2801,7 @@ objects/ops.o: ops.c
28012801
$(CCC) -o $@ ops.c
28022802

28032803
objects/option.o: option.c
2804-
$(CCC) -o $@ option.c
2804+
$(CCC) $(LUA_CFLAGS) $(PERL_CFLAGS) $(PYTHON_CFLAGS) $(PYTHON3_CFLAGS) $(RUBY_CFLAGS) -o $@ option.c
28052805

28062806
objects/os_beos.o: os_beos.c
28072807
$(CCC) -o $@ os_beos.c

‎src/if_lua.c‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -402,12 +402,7 @@ lua_link_init(char *libname, int verbose)
402402
int
403403
lua_enabled(int verbose)
404404
{
405-
#ifdef WIN3264
406-
char *dll = DYNAMIC_LUA_DLL;
407-
#else
408-
char *dll = *p_luadll ? (char *)p_luadll : DYNAMIC_LUA_DLL;
409-
#endif
410-
return lua_link_init(dll, verbose) == OK;
405+
return lua_link_init((char *)p_luadll, verbose) == OK;
411406
}
412407

413408
#endif /* DYNAMIC_LUA */

‎src/if_perl.xs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -611,12 +611,7 @@ perl_runtime_link_init(char *libname, int verbose)
611611
perl_enabled(verbose)
612612
int verbose;
613613
{
614-
#ifdef WIN3264
615-
char *dll = DYNAMIC_PERL_DLL;
616-
#else
617-
char *dll = *p_perldll ? (char *)p_perldll : DYNAMIC_PERL_DLL;
618-
#endif
619-
return perl_runtime_link_init(dll, verbose) == OK;
614+
return perl_runtime_link_init((char *)p_perldll, verbose) == OK;
620615
}
621616
#endif /* DYNAMIC_PERL */
622617

‎src/if_python.c‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -732,12 +732,7 @@ python_runtime_link_init(char *libname, int verbose)
732732
int
733733
python_enabled(int verbose)
734734
{
735-
#ifdef WIN3264
736-
char *dll = DYNAMIC_PYTHON_DLL;
737-
#else
738-
char *dll = *p_pydll ? (char *)p_pydll : DYNAMIC_PYTHON_DLL;
739-
#endif
740-
return python_runtime_link_init(dll, verbose) == OK;
735+
return python_runtime_link_init((char *)p_pydll, verbose) == OK;
741736
}
742737

743738
/*

‎src/if_python3.c‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -686,12 +686,7 @@ py3_runtime_link_init(char *libname, int verbose)
686686
int
687687
python3_enabled(int verbose)
688688
{
689-
#ifdef WIN3264
690-
char *dll = DYNAMIC_PYTHON3_DLL;
691-
#else
692-
char *dll = *p_py3dll ? (char *)p_py3dll : DYNAMIC_PYTHON3_DLL;
693-
#endif
694-
return py3_runtime_link_init(dll, verbose) == OK;
689+
return py3_runtime_link_init((char *)p_py3dll, verbose) == OK;
695690
}
696691

697692
/* Load the standard Python exceptions - don't import the symbols from the

‎src/if_ruby.c‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -677,12 +677,7 @@ ruby_runtime_link_init(char *libname, int verbose)
677677
ruby_enabled(verbose)
678678
int verbose;
679679
{
680-
#ifdef WIN3264
681-
char *dll = DYNAMIC_RUBY_DLL;
682-
#else
683-
char *dll = *p_rubydll ? (char *)p_rubydll : DYNAMIC_RUBY_DLL;
684-
#endif
685-
return ruby_runtime_link_init(dll, verbose) == OK;
680+
return ruby_runtime_link_init((char *)p_rubydll, verbose) == OK;
686681
}
687682
#endif /* defined(DYNAMIC_RUBY) || defined(PROTO) */
688683

‎src/option.c‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1776,10 +1776,11 @@ static struct vimoption
17761776
{"loadplugins", "lpl", P_BOOL|P_VI_DEF,
17771777
(char_u *)&p_lpl, PV_NONE,
17781778
{(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
1779-
#if defined(DYNAMIC_LUA) && !defined(WIN3264)
1779+
#if defined(DYNAMIC_LUA)
17801780
{"luadll", NULL, P_STRING|P_VI_DEF|P_SECURE,
17811781
(char_u *)&p_luadll, PV_NONE,
1782-
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
1782+
{(char_u *)DYNAMIC_LUA_DLL, (char_u *)0L}
1783+
SCRIPTID_INIT},
17831784
#endif
17841785
#ifdef FEAT_GUI_MAC
17851786
{"macatsui", NULL, P_BOOL|P_VI_DEF|P_RCLR,
@@ -2016,10 +2017,11 @@ static struct vimoption
20162017
# endif
20172018
#endif
20182019
(char_u *)0L} SCRIPTID_INIT},
2019-
#if defined(DYNAMIC_PERL) && !defined(WIN3264)
2020+
#if defined(DYNAMIC_PERL)
20202021
{"perldll", NULL, P_STRING|P_VI_DEF|P_SECURE,
20212022
(char_u *)&p_perldll, PV_NONE,
2022-
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
2023+
{(char_u *)DYNAMIC_PERL_DLL, (char_u *)0L}
2024+
SCRIPTID_INIT},
20232025
#endif
20242026
{"preserveindent", "pi", P_BOOL|P_VI_DEF|P_VIM,
20252027
(char_u *)&p_pi, PV_PI,
@@ -2126,15 +2128,17 @@ static struct vimoption
21262128
(char_u *)NULL, PV_NONE,
21272129
#endif
21282130
{(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
2129-
#if defined(DYNAMIC_PYTHON3) && !defined(WIN3264)
2131+
#if defined(DYNAMIC_PYTHON3)
21302132
{"pythonthreedll", NULL, P_STRING|P_VI_DEF|P_SECURE,
21312133
(char_u *)&p_py3dll, PV_NONE,
2132-
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
2134+
{(char_u *)DYNAMIC_PYTHON3_DLL, (char_u *)0L}
2135+
SCRIPTID_INIT},
21332136
#endif
2134-
#if defined(DYNAMIC_PYTHON) && !defined(WIN3264)
2137+
#if defined(DYNAMIC_PYTHON)
21352138
{"pythondll", NULL, P_STRING|P_VI_DEF|P_SECURE,
21362139
(char_u *)&p_pydll, PV_NONE,
2137-
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
2140+
{(char_u *)DYNAMIC_PYTHON_DLL, (char_u *)0L}
2141+
SCRIPTID_INIT},
21382142
#endif
21392143
{"quoteescape", "qe", P_STRING|P_ALLOCED|P_VI_DEF,
21402144
#ifdef FEAT_TEXTOBJ
@@ -2209,10 +2213,11 @@ static struct vimoption
22092213
{(char_u *)NULL, (char_u *)0L}
22102214
#endif
22112215
SCRIPTID_INIT},
2212-
#if defined(DYNAMIC_RUBY) && !defined(WIN3264)
2216+
#if defined(DYNAMIC_RUBY)
22132217
{"rubydll", NULL, P_STRING|P_VI_DEF|P_SECURE,
22142218
(char_u *)&p_rubydll, PV_NONE,
2215-
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
2219+
{(char_u *)DYNAMIC_RUBY_DLL, (char_u *)0L}
2220+
SCRIPTID_INIT},
22162221
#endif
22172222
{"ruler", "ru", P_BOOL|P_VI_DEF|P_VIM|P_RSTAT,
22182223
#ifdef FEAT_CMDL_INFO

‎src/version.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,8 @@ static char *(features[]) =
741741

742742
static int included_patches[] =
743743
{ /* Add new patch number below this line */
744+
/**/
745+
1065,
744746
/**/
745747
1064,
746748
/**/

0 commit comments

Comments
 (0)