lkundrak / rpms / vim

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