aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 7.4.1845

Browse Source 
Problem:    Mentioning NetBeans when reading from channel. (Ramel Eshed)
Solution:   Make the text more generic.
This commit is contained in:
Bram Moolenaar 2016-05-25 21:48:13 +02:00
parent 8e8df251bf
commit f8df45d84f
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/channel.c
View File

@ -505,7 +505,7 @@ channel_read_fd(int fd)
if (channel == NULL) if (channel == NULL)
ch_errorn(NULL, "Channel for fd %d not found", fd); ch_errorn(NULL, "Channel for fd %d not found", fd);
else else
channel_read(channel, part, "messageFromNetbeans"); channel_read(channel, part, "channel_read_fd");
} }
#endif #endif
@ -514,9 +514,9 @@ channel_read_fd(int fd)
*/ */
#ifdef FEAT_GUI_X11 #ifdef FEAT_GUI_X11
static void static void
messageFromNetbeans(XtPointer clientData, messageFromServer(XtPointer clientData,
int *unused1 UNUSED, int *unused1 UNUSED,
XtInputId *unused2 UNUSED) XtInputId *unused2 UNUSED)
{ {
channel_read_fd((int)(long)clientData); channel_read_fd((int)(long)clientData);
} }
@ -525,9 +525,9 @@ messageFromNetbeans(XtPointer clientData,
#ifdef FEAT_GUI_GTK #ifdef FEAT_GUI_GTK
# if GTK_CHECK_VERSION(3,0,0) # if GTK_CHECK_VERSION(3,0,0)
static gboolean static gboolean
messageFromNetbeans(GIOChannel *unused1 UNUSED, messageFromServer(GIOChannel *unused1 UNUSED,
GIOCondition unused2 UNUSED, GIOCondition unused2 UNUSED,
gpointer clientData) gpointer clientData)
{ {
channel_read_fd(GPOINTER_TO_INT(clientData)); channel_read_fd(GPOINTER_TO_INT(clientData));
return TRUE; /* Return FALSE instead in case the event source is to return TRUE; /* Return FALSE instead in case the event source is to
@ -535,9 +535,9 @@ messageFromNetbeans(GIOChannel *unused1 UNUSED,
} }
# else # else
static void static void
messageFromNetbeans(gpointer clientData, messageFromServer(gpointer clientData,
gint unused1 UNUSED, gint unused1 UNUSED,
GdkInputCondition unused2 UNUSED) GdkInputCondition unused2 UNUSED)
{ {
channel_read_fd((int)(long)clientData); channel_read_fd((int)(long)clientData);
} }
@ -558,7 +558,7 @@ channel_gui_register_one(channel_T *channel, int part)
(XtAppContext)app_context, (XtAppContext)app_context,
channel->ch_part[part].ch_fd, channel->ch_part[part].ch_fd,
(XtPointer)(XtInputReadMask + XtInputExceptMask), (XtPointer)(XtInputReadMask + XtInputExceptMask),
messageFromNetbeans, messageFromServer,
(XtPointer)(long)channel->ch_part[part].ch_fd); (XtPointer)(long)channel->ch_part[part].ch_fd);
# else # else
# ifdef FEAT_GUI_GTK # ifdef FEAT_GUI_GTK
@ -573,7 +573,7 @@ channel_gui_register_one(channel_T *channel, int part)
channel->ch_part[part].ch_inputHandler = g_io_add_watch( channel->ch_part[part].ch_inputHandler = g_io_add_watch(
chnnl, chnnl,
G_IO_IN|G_IO_HUP|G_IO_ERR|G_IO_PRI, G_IO_IN|G_IO_HUP|G_IO_ERR|G_IO_PRI,
messageFromNetbeans, messageFromServer,
GINT_TO_POINTER(channel->ch_part[part].ch_fd)); GINT_TO_POINTER(channel->ch_part[part].ch_fd));
g_io_channel_unref(chnnl); g_io_channel_unref(chnnl);
@ -583,7 +583,7 @@ channel_gui_register_one(channel_T *channel, int part)
(gint)channel->ch_part[part].ch_fd, (gint)channel->ch_part[part].ch_fd,
(GdkInputCondition) (GdkInputCondition)
((int)GDK_INPUT_READ + (int)GDK_INPUT_EXCEPTION), ((int)GDK_INPUT_READ + (int)GDK_INPUT_EXCEPTION),
messageFromNetbeans, messageFromServer,
(gpointer)(long)channel->ch_part[part].ch_fd); (gpointer)(long)channel->ch_part[part].ch_fd);
# endif # endif
# endif # endif

2
src/version.c
View File

@ -753,6 +753,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1845,
/**/ /**/
1844, 1844,
/**/ /**/