patch 7.4.918

Problem:    A digit in an option name has problems.
Solution:   Rename 'python3dll' to 'pythonthreedll'.

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index f0e4f58c1f89687d68f72c61ace3cd433a86334b..c987545eaef49a683c703eefca144377e08fef04 100644 (file)
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5698,8 +5698,8 @@ A jump table for the options with a short description can be found at |Q_op|.
        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|

diff --git a/src/option.c b/src/option.c
index bc44cb2d4bde9c7c13a7436acad80b1c63d3df70..6f9c5f5c2a9d72867eefc76fc5c4c2e52b766a02 100644 (file)
--- 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 739fd67bbee75e6f3f9f4948d9ead8aeb268cbef..f87283687a9592701bab9200c553d7649a2580f5 100644 (file)
--- 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 0255d52011a744141120d2ba34496eceb3542d9c..eef83bdc3855d15a52bfbf056fc803f7741668f0 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    918,
 /**/
     917,
 /**/