From 0796c0625fa4b9eb2f47fe8c976b78523924e1fb Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 10 Nov 2015 19:41:37 +0100 Subject: [PATCH] patch 7.4.918 Problem: A digit in an option name has problems. Solution: Rename 'python3dll' to 'pythonthreedll'. --- runtime/doc/options.txt | 4 ++-- src/option.c | 2 +- src/option.h | 2 +- src/version.c | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index f0e4f58c1..c987545ea 100644 --- 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 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 @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 918, /**/ 917, /**/ -- 2.50.1