changeset 7218:36dc8df8560f v7.4.918

commit https://github.com/vim/vim/commit/0796c0625fa4b9eb2f47fe8c976b78523924e1fb Author: Bram Moolenaar <Bram@vim.org> Date: Tue Nov 10 19:41:37 2015 +0100 patch 7.4.918 Problem: A digit in an option name has problems. Solution: Rename 'python3dll' to 'pythonthreedll'.
author Christian Brabandt <cb@256bit.org>
date Tue, 10 Nov 2015 19:45:04 +0100
parents cbdc50315558
children 170c55b88b4c
files runtime/doc/options.txt src/option.c src/option.h src/version.c
diffstat 4 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5698,8 +5698,8 @@ A jump table for the options with a shor
 	Insert mode completion.  When zero as much space as available is used.
 	|ins-completion-menu|.
 
-						*'python3dll'*
-'python3dll' 		string	(default empty)
+						*'pythonthreedll'*
+'pythonthreedll'	string	(default empty)
 			global
 			{not in Vi} {only for Unix}
 			{only available when compiled with the |+python3/dyn|
--- 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
--- 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' */
--- 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,