summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-11-10 19:48:14 +0100
committerBram Moolenaar <Bram@vim.org>2015-11-10 19:48:14 +0100
commitd4ece23e2e602d820ab7367c383dc0d72dd87029 (patch)
tree210d3568ca1580cfbc1bfb2f97803b2327506f8f
parent0796c0625fa4b9eb2f47fe8c976b78523924e1fb (diff)
downloadvim-git-d4ece23e2e602d820ab7367c383dc0d72dd87029.tar.gz
patch 7.4.919v7.4.919
Problem: The dll options are not in the options window. Solution: Add the dll options. And other fixes.
-rw-r--r--runtime/optwin.vim18
-rw-r--r--src/version.c2
2 files changed, 19 insertions, 1 deletions
diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index e5bd6c802..d1e53367b 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -1,7 +1,7 @@
" These commands create the option window.
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2015 Jul 22
+" Last Change: 2015 Nov 10
" If there already is an option window, jump to that one.
if bufwinnr("option-window") > 0
@@ -1307,6 +1307,22 @@ if has("mzscheme")
call append("$", "mzquantum\tinterval in milliseconds between polls for MzScheme threads")
call append("$", " \tset mzq=" . &mzq)
endif
+if exists("&luadll")
+ call append("$", "luadll\tname of the Lua dynamic library")
+ call <SID>OptionG("luadll", &luadll)
+endif
+if exists("&perldll")
+ call append("$", "perldll\tname of the Perl dynamic library")
+ call <SID>OptionG("perldll", &perldll)
+endif
+if exists("&pythondll")
+ call append("$", "pythondll\tname of the Python 2 dynamic library")
+ call <SID>OptionG("pythondll", &pythondll)
+endif
+if exists("&pythonthreedll")
+ call append("$", "pythonthreedll\tname of the Python 3 dynamic library")
+ call <SID>OptionG("pythonthreedll", &pythonthreedll)
+endif
set cpo&vim
diff --git a/src/version.c b/src/version.c
index eef83bdc3..a52dca982 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 919,
+/**/
918,
/**/
917,