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