Merge remote-tracking branch 'vim/master'

Author: splhack

src/channel.c

@@ -21635,6 +21635,7 @@ free_tv(varp)
 	    case VAR_FLOAT:
 #endif
 	    case VAR_UNKNOWN:
+	    case VAR_SPECIAL:
 		break;
 	    default:
 		EMSG2(_(e_intern2), "free_tv()");

src/eval.c

@@ -5064,8 +5064,8 @@ ex_gui(eap)
 	 * of the argument ending up after the shell prompt. */
 	msg_clr_eos_force();
 	gui_start();
-#ifdef FEAT_NETBEANS_INTG
-	netbeans_gui_register();
+#ifdef FEAT_CHANNEL
+	channel_gui_register_all();
 #endif
     }
     if (!ends_excmd(*eap->arg))

src/gui.c

@@ -1779,9 +1779,10 @@ process_message(void)
     }
 #endif
 
-#ifdef FEAT_NETBEANS_INTG
+#ifdef FEAT_CHANNEL
     if (msg.message == WM_NETBEANS)
     {
+	/* TODO: channel_read(idx) */
 	netbeans_read();
 	return;
     }