Mercurial > vim
changeset 9123:b430d4f2aa79 v7.4.1845
commit https://github.com/vim/vim/commit/f8df45d84f1d17dced23e185d4835fc23406d73d
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed May 25 21:48:13 2016 +0200
patch 7.4.1845
Problem: Mentioning NetBeans when reading from channel. (Ramel Eshed)
Solution: Make the text more generic.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 25 May 2016 22:00:06 +0200 |
| parents | 1de11ad6391f |
| children | 3b80417c6e2c |
| files | src/channel.c src/version.c |
| diffstat | 2 files changed, 15 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/channel.c +++ b/src/channel.c @@ -505,7 +505,7 @@ channel_read_fd(int fd) if (channel == NULL) ch_errorn(NULL, "Channel for fd %d not found", fd); else - channel_read(channel, part, "messageFromNetbeans"); + channel_read(channel, part, "channel_read_fd"); } #endif @@ -514,9 +514,9 @@ channel_read_fd(int fd) */ #ifdef FEAT_GUI_X11 static void -messageFromNetbeans(XtPointer clientData, - int *unused1 UNUSED, - XtInputId *unused2 UNUSED) +messageFromServer(XtPointer clientData, + int *unused1 UNUSED, + XtInputId *unused2 UNUSED) { channel_read_fd((int)(long)clientData); } @@ -525,9 +525,9 @@ messageFromNetbeans(XtPointer clientData #ifdef FEAT_GUI_GTK # if GTK_CHECK_VERSION(3,0,0) static gboolean -messageFromNetbeans(GIOChannel *unused1 UNUSED, - GIOCondition unused2 UNUSED, - gpointer clientData) +messageFromServer(GIOChannel *unused1 UNUSED, + GIOCondition unused2 UNUSED, + gpointer clientData) { channel_read_fd(GPOINTER_TO_INT(clientData)); return TRUE; /* Return FALSE instead in case the event source is to @@ -535,9 +535,9 @@ messageFromNetbeans(GIOChannel *unused1 } # else static void -messageFromNetbeans(gpointer clientData, - gint unused1 UNUSED, - GdkInputCondition unused2 UNUSED) +messageFromServer(gpointer clientData, + gint unused1 UNUSED, + GdkInputCondition unused2 UNUSED) { channel_read_fd((int)(long)clientData); } @@ -558,7 +558,7 @@ channel_gui_register_one(channel_T *chan (XtAppContext)app_context, channel->ch_part[part].ch_fd, (XtPointer)(XtInputReadMask + XtInputExceptMask), - messageFromNetbeans, + messageFromServer, (XtPointer)(long)channel->ch_part[part].ch_fd); # else # ifdef FEAT_GUI_GTK @@ -573,7 +573,7 @@ channel_gui_register_one(channel_T *chan channel->ch_part[part].ch_inputHandler = g_io_add_watch( chnnl, G_IO_IN|G_IO_HUP|G_IO_ERR|G_IO_PRI, - messageFromNetbeans, + messageFromServer, GINT_TO_POINTER(channel->ch_part[part].ch_fd)); g_io_channel_unref(chnnl); @@ -583,7 +583,7 @@ channel_gui_register_one(channel_T *chan (gint)channel->ch_part[part].ch_fd, (GdkInputCondition) ((int)GDK_INPUT_READ + (int)GDK_INPUT_EXCEPTION), - messageFromNetbeans, + messageFromServer, (gpointer)(long)channel->ch_part[part].ch_fd); # endif # endif