dcaee6
To: vim_dev@googlegroups.com
dcaee6
Subject: Patch 7.4.046
dcaee6
Fcc: outbox
dcaee6
From: Bram Moolenaar <Bram@moolenaar.net>
dcaee6
Mime-Version: 1.0
dcaee6
Content-Type: text/plain; charset=UTF-8
dcaee6
Content-Transfer-Encoding: 8bit
dcaee6
------------
dcaee6
dcaee6
Patch 7.4.046
dcaee6
Problem:    Can't use Tcl 8.6.
dcaee6
Solution:   Change how Tcl_FindExecutable is called. (Jan Nijtmans)
dcaee6
Files:	    src/if_tcl.c
dcaee6
dcaee6
dcaee6
*** ../vim-7.4.045/src/if_tcl.c	2013-08-02 19:31:15.000000000 +0200
dcaee6
--- src/if_tcl.c	2013-10-02 13:44:48.000000000 +0200
dcaee6
***************
dcaee6
*** 165,170 ****
dcaee6
--- 165,171 ----
dcaee6
   */
dcaee6
  static HANDLE hTclLib = NULL;
dcaee6
  Tcl_Interp* (*dll_Tcl_CreateInterp)();
dcaee6
+ void (*dll_Tcl_FindExecutable)(const void *);
dcaee6
  
dcaee6
  /*
dcaee6
   * Table of name to function pointer of tcl.
dcaee6
***************
dcaee6
*** 175,180 ****
dcaee6
--- 176,182 ----
dcaee6
      TCL_PROC* ptr;
dcaee6
  } tcl_funcname_table[] = {
dcaee6
      {"Tcl_CreateInterp", (TCL_PROC*)&dll_Tcl_CreateInterp},
dcaee6
+     {"Tcl_FindExecutable", (TCL_PROC*)&dll_Tcl_FindExecutable},
dcaee6
      {NULL, NULL},
dcaee6
  };
dcaee6
  
dcaee6
***************
dcaee6
*** 248,258 ****
dcaee6
      {
dcaee6
  	Tcl_Interp *interp;
dcaee6
  
dcaee6
  	if (interp = dll_Tcl_CreateInterp())
dcaee6
  	{
dcaee6
  	    if (Tcl_InitStubs(interp, DYNAMIC_TCL_VER, 0))
dcaee6
  	    {
dcaee6
- 		Tcl_FindExecutable(find_executable_arg);
dcaee6
  		Tcl_DeleteInterp(interp);
dcaee6
  		stubs_initialized = TRUE;
dcaee6
  	    }
dcaee6
--- 250,261 ----
dcaee6
      {
dcaee6
  	Tcl_Interp *interp;
dcaee6
  
dcaee6
+ 	dll_Tcl_FindExecutable(find_executable_arg);
dcaee6
+ 
dcaee6
  	if (interp = dll_Tcl_CreateInterp())
dcaee6
  	{
dcaee6
  	    if (Tcl_InitStubs(interp, DYNAMIC_TCL_VER, 0))
dcaee6
  	    {
dcaee6
  		Tcl_DeleteInterp(interp);
dcaee6
  		stubs_initialized = TRUE;
dcaee6
  	    }
dcaee6
*** ../vim-7.4.045/src/version.c	2013-09-29 21:11:00.000000000 +0200
dcaee6
--- src/version.c	2013-10-02 13:46:47.000000000 +0200
dcaee6
***************
dcaee6
*** 740,741 ****
dcaee6
--- 740,743 ----
dcaee6
  {   /* Add new patch number below this line */
dcaee6
+ /**/
dcaee6
+     46,
dcaee6
  /**/
dcaee6
dcaee6
-- 
dcaee6
Not too long ago, a program was something you watched on TV...
dcaee6
dcaee6
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
dcaee6
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
dcaee6
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
dcaee6
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///