summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-11-10 19:41:37 +0100
committerBram Moolenaar <Bram@vim.org>2015-11-10 19:41:37 +0100
commit0796c0625fa4b9eb2f47fe8c976b78523924e1fb (patch)
treee4a3514674b2a5ec83a7ef91f517f88576a336a5 /src
parent1be2ed6c11671eabefa0fc8600fd2af6cd3963e8 (diff)
downloadvim-0796c0625fa4b9eb2f47fe8c976b78523924e1fb.zip
patch 7.4.918
Problem: A digit in an option name has problems. Solution: Rename 'python3dll' to 'pythonthreedll'.
Diffstat (limited to 'src')
-rw-r--r--src/option.c2
-rw-r--r--src/option.h2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/option.c b/src/option.c
index bc44cb2d4..6f9c5f5c2 100644
--- a/src/option.c
+++ b/src/option.c
@@ -2130,7 +2130,7 @@ static struct vimoption
#endif
{(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
#if defined(DYNAMIC_PYTHON3) && !defined(WIN3264)
- {"python3dll", NULL, P_STRING|P_VI_DEF|P_SECURE,
+ {"pythonthreedll", NULL, P_STRING|P_VI_DEF|P_SECURE,
(char_u *)&p_py3dll, PV_NONE,
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
#endif
diff --git a/src/option.h b/src/option.h
index 739fd67bb..f87283687 100644
--- a/src/option.h
+++ b/src/option.h
@@ -689,7 +689,7 @@ EXTERN char_u *p_cdpath; /* 'cdpath' */
EXTERN char_u *p_perldll; /* 'perldll' */
#endif
#if defined(DYNAMIC_PYTHON3) && !defined(WIN3264)
-EXTERN char_u *p_py3dll; /* 'python3dll' */
+EXTERN char_u *p_py3dll; /* 'pythonthreedll' */
#endif
#if defined(DYNAMIC_PYTHON) && !defined(WIN3264)
EXTERN char_u *p_pydll; /* 'pythondll' */
diff --git a/src/version.c b/src/version.c
index 0255d5201..eef83bdc3 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 */
/**/
+ 918,
+/**/
917,
/**/
916,