]> granicus.if.org Git - vim/commitdiff
updated for version 7.4.046 v7.4.046
authorBram Moolenaar <Bram@vim.org>
Wed, 2 Oct 2013 12:25:44 +0000 (14:25 +0200)
committerBram Moolenaar <Bram@vim.org>
Wed, 2 Oct 2013 12:25:44 +0000 (14:25 +0200)
Problem:    Can't use Tcl 8.6.
Solution:   Change how Tcl_FindExecutable is called. (Jan Nijtmans)

src/if_tcl.c
src/version.c

index be9cd64cb3331e66c6e0bcac00d7d84c8f713f98..b798ea59abcda322522d43f0ae578ad26c33de10 100644 (file)
@@ -165,6 +165,7 @@ typedef int HANDLE;
  */
 static HANDLE hTclLib = NULL;
 Tcl_Interp* (*dll_Tcl_CreateInterp)();
+void (*dll_Tcl_FindExecutable)(const void *);
 
 /*
  * Table of name to function pointer of tcl.
@@ -175,6 +176,7 @@ static struct {
     TCL_PROC* ptr;
 } tcl_funcname_table[] = {
     {"Tcl_CreateInterp", (TCL_PROC*)&dll_Tcl_CreateInterp},
+    {"Tcl_FindExecutable", (TCL_PROC*)&dll_Tcl_FindExecutable},
     {NULL, NULL},
 };
 
@@ -248,11 +250,12 @@ tcl_enabled(verbose)
     {
        Tcl_Interp *interp;
 
+       dll_Tcl_FindExecutable(find_executable_arg);
+
        if (interp = dll_Tcl_CreateInterp())
        {
            if (Tcl_InitStubs(interp, DYNAMIC_TCL_VER, 0))
            {
-               Tcl_FindExecutable(find_executable_arg);
                Tcl_DeleteInterp(interp);
                stubs_initialized = TRUE;
            }
index 63882ee7872f21a858719b7fdc674b4d437b3e8a..c43ae93f080e309bc2bd5f418ace47ee67be84c8 100644 (file)
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    46,
 /**/
     45,
 /**/