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