Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1487 2a77ed30-b011-0410-a7ad-c7884a0aa172
  • Loading branch information...
commit 0426425d202fa00eae94f2e22880daf6bd102e98 1 parent 4a78266
edyfox authored
Showing with 29 additions and 19 deletions.
  1. +27 −19 src/if_tcl.c
  2. +2 −0  src/version.c
46 src/if_tcl.c
View
@@ -161,7 +161,7 @@ typedef int HANDLE;
# endif
/*
- * Declare HANDLE for perl.dll and function pointers.
+ * Declare HANDLE for tcl.dll and function pointers.
*/
static HANDLE hTclLib = NULL;
Tcl_Interp* (*dll_Tcl_CreateInterp)();
@@ -182,7 +182,7 @@ static struct {
* Make all runtime-links of tcl.
*
* 1. Get module handle using LoadLibraryEx.
- * 2. Get pointer to perl function by GetProcAddress.
+ * 2. Get pointer to tcl function by GetProcAddress.
* 3. Repeat 2, until get all functions will be used.
*
* Parameter 'libname' provides name of DLL.
@@ -1670,23 +1670,31 @@ channel_gethandle(instance, direction, handleptr)
static Tcl_ChannelType channel_type =
{
- "vimmessage",
- NULL, /* blockmode */
- channel_close,
- channel_input,
- channel_output,
- NULL, /* seek */
- NULL, /* set option */
- NULL, /* get option */
- channel_watch,
- channel_gethandle,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL
+ "vimmessage", /* typeName */
+ NULL, /* version */
+ channel_close, /* closeProc */
+ channel_input, /* inputProc */
+ channel_output, /* outputProc */
+ NULL, /* seekProc */
+ NULL, /* setOptionProc */
+ NULL, /* getOptionProc */
+ channel_watch, /* watchProc */
+ channel_gethandle, /* getHandleProc */
+ NULL, /* close2Proc */
+ NULL, /* blockModeProc */
+#ifdef TCL_CHANNEL_VERSION_2
+ NULL, /* flushProc */
+ NULL, /* handlerProc */
+#endif
+#ifdef TCL_CHANNEL_VERSION_3
+ NULL, /* wideSeekProc */
+#endif
+#ifdef TCL_CHANNEL_VERSION_4
+ NULL, /* threadActionProc */
+#endif
+#ifdef TCL_CHANNEL_VERSION_5
+ NULL /* truncateProc */
+#endif
};
/**********************************
2  src/version.c
View
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 187,
+/**/
186,
/**/
185,
Please sign in to comment.
Something went wrong with that request. Please try again.