To: vim_dev@googlegroups.com

Subject: Patch 7.4.918

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.4.918

Problem:    A digit in an option name has problems.

Solution:   Rename 'python3dll' to 'pythonthreedll'.

Files:      src/option.c, src/option.h, runtime/doc/options.txt

*** ../vim-7.4.917/src/option.c	2015-11-10 17:50:20.713430521 +0100

--- src/option.c	2015-11-10 19:27:44.075652319 +0100

***************

*** 2130,2136 ****

  #endif

  			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},

  #if defined(DYNAMIC_PYTHON3) && !defined(WIN3264)

!     {"python3dll",  NULL,   P_STRING|P_VI_DEF|P_SECURE,

  			    (char_u *)&p_py3dll, PV_NONE,

  			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},

  #endif

--- 2130,2136 ----

  #endif

  			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},

  #if defined(DYNAMIC_PYTHON3) && !defined(WIN3264)

!     {"pythonthreedll",  NULL,   P_STRING|P_VI_DEF|P_SECURE,

  			    (char_u *)&p_py3dll, PV_NONE,

  			    {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},

  #endif

*** ../vim-7.4.917/src/option.h	2015-11-02 15:27:03.442325459 +0100

--- src/option.h	2015-11-10 19:27:58.923505522 +0100

***************

*** 689,695 ****

  EXTERN char_u	*p_perldll;	/* 'perldll' */

  #endif

  #if defined(DYNAMIC_PYTHON3) && !defined(WIN3264)

! EXTERN char_u	*p_py3dll;	/* 'python3dll' */

  #endif

  #if defined(DYNAMIC_PYTHON) && !defined(WIN3264)

  EXTERN char_u	*p_pydll;	/* 'pythondll' */

--- 689,695 ----

  EXTERN char_u	*p_perldll;	/* 'perldll' */

  #endif

  #if defined(DYNAMIC_PYTHON3) && !defined(WIN3264)

! EXTERN char_u	*p_py3dll;	/* 'pythonthreedll' */

  #endif

  #if defined(DYNAMIC_PYTHON) && !defined(WIN3264)

  EXTERN char_u	*p_pydll;	/* 'pythondll' */

*** ../vim-7.4.917/runtime/doc/options.txt	2015-11-02 15:27:03.434325554 +0100

--- runtime/doc/options.txt	2015-11-10 19:27:08.200007003 +0100

***************

*** 5680,5687 ****

  	Insert mode completion.  When zero as much space as available is used.

  	|ins-completion-menu|.

! 						*'python3dll'*

! 'python3dll' 		string	(default empty)

  			global

  			{not in Vi} {only for Unix}

  			{only available when compiled with the |+python3/dyn|

--- 5698,5705 ----

  	Insert mode completion.  When zero as much space as available is used.

  	|ins-completion-menu|.

! 						*'pythonthreedll'*

! 'pythonthreedll'	string	(default empty)

  			global

  			{not in Vi} {only for Unix}

  			{only available when compiled with the |+python3/dyn|

*** ../vim-7.4.917/src/version.c	2015-11-10 19:11:55.173027459 +0100

--- src/version.c	2015-11-10 19:28:55.926940874 +0100

***************

*** 743,744 ****

--- 743,746 ----

  {   /* Add new patch number below this line */

+ /**/

+     918,

  /**/

-- 

I AM THANKFUL...

...for the clothes that fit a little too snug because it

means I have more than enough to eat.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\

///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\

\\\  an exciting new programming language -- http://www.Zimbu.org        ///

 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///