To: vim_dev@googlegroups.com Subject: Patch 7.4.1845 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1845 Problem: Mentioning NetBeans when reading from channel. (Ramel Eshed) Solution: Make the text more generic. Files: src/channel.c *** ../vim-7.4.1844/src/channel.c 2016-05-09 20:52:04.635078565 +0200 --- src/channel.c 2016-05-25 21:29:12.881823028 +0200 *************** *** 505,511 **** if (channel == NULL) ch_errorn(NULL, "Channel for fd %d not found", fd); else ! channel_read(channel, part, "messageFromNetbeans"); } #endif --- 505,511 ---- if (channel == NULL) ch_errorn(NULL, "Channel for fd %d not found", fd); else ! channel_read(channel, part, "channel_read_fd"); } #endif *************** *** 514,522 **** */ #ifdef FEAT_GUI_X11 static void ! messageFromNetbeans(XtPointer clientData, ! int *unused1 UNUSED, ! XtInputId *unused2 UNUSED) { channel_read_fd((int)(long)clientData); } --- 514,522 ---- */ #ifdef FEAT_GUI_X11 static void ! messageFromServer(XtPointer clientData, ! int *unused1 UNUSED, ! XtInputId *unused2 UNUSED) { channel_read_fd((int)(long)clientData); } *************** *** 525,533 **** #ifdef FEAT_GUI_GTK # if GTK_CHECK_VERSION(3,0,0) static gboolean ! messageFromNetbeans(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 --- 525,533 ---- #ifdef FEAT_GUI_GTK # if GTK_CHECK_VERSION(3,0,0) static gboolean ! 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,543 **** } # else static void ! messageFromNetbeans(gpointer clientData, ! gint unused1 UNUSED, ! GdkInputCondition unused2 UNUSED) { channel_read_fd((int)(long)clientData); } --- 535,543 ---- } # else static void ! messageFromServer(gpointer clientData, ! gint unused1 UNUSED, ! GdkInputCondition unused2 UNUSED) { channel_read_fd((int)(long)clientData); } *************** *** 558,564 **** (XtAppContext)app_context, channel->ch_part[part].ch_fd, (XtPointer)(XtInputReadMask + XtInputExceptMask), ! messageFromNetbeans, (XtPointer)(long)channel->ch_part[part].ch_fd); # else # ifdef FEAT_GUI_GTK --- 558,564 ---- (XtAppContext)app_context, channel->ch_part[part].ch_fd, (XtPointer)(XtInputReadMask + XtInputExceptMask), ! messageFromServer, (XtPointer)(long)channel->ch_part[part].ch_fd); # else # ifdef FEAT_GUI_GTK *************** *** 573,579 **** channel->ch_part[part].ch_inputHandler = g_io_add_watch( chnnl, G_IO_IN|G_IO_HUP|G_IO_ERR|G_IO_PRI, ! messageFromNetbeans, GINT_TO_POINTER(channel->ch_part[part].ch_fd)); g_io_channel_unref(chnnl); --- 573,579 ---- channel->ch_part[part].ch_inputHandler = g_io_add_watch( chnnl, G_IO_IN|G_IO_HUP|G_IO_ERR|G_IO_PRI, ! messageFromServer, GINT_TO_POINTER(channel->ch_part[part].ch_fd)); g_io_channel_unref(chnnl); *************** *** 583,589 **** (gint)channel->ch_part[part].ch_fd, (GdkInputCondition) ((int)GDK_INPUT_READ + (int)GDK_INPUT_EXCEPTION), ! messageFromNetbeans, (gpointer)(long)channel->ch_part[part].ch_fd); # endif # endif --- 583,589 ---- (gint)channel->ch_part[part].ch_fd, (GdkInputCondition) ((int)GDK_INPUT_READ + (int)GDK_INPUT_EXCEPTION), ! messageFromServer, (gpointer)(long)channel->ch_part[part].ch_fd); # endif # endif *** ../vim-7.4.1844/src/version.c 2016-05-25 21:22:56.425828207 +0200 --- src/version.c 2016-05-25 21:47:04.033808294 +0200 *************** *** 755,756 **** --- 755,758 ---- { /* Add new patch number below this line */ + /**/ + 1845, /**/ -- hundred-and-one symptoms of being an internet addict: 8. You spend half of the plane trip with your laptop on your lap...and your child in the overhead compartment. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///