Merge remote-tracking branch 'vim/master'

src/channel.c

@@ -119,6 +119,8 @@ typedef struct {
 
     void      (*ch_close_cb)(void); /* callback for when channel is closed */
 
+    int	      ch_block_id;	/* ID that channel_read_json_block() is
+				   waiting for */
     char_u    *ch_callback;	/* function to call when a msg is not handled */
     cbq_T     ch_cb_head;	/* dummy node for pre-request callbacks */
 
@@ -790,15 +792,17 @@ remove_json_node(jsonq_T *node)
 /*
  * Get a message from the JSON queue for channel "ch_idx".
  * When "id" is positive it must match the first number in the list.
- * When "id" is zero or negative jut get the first message.
+ * When "id" is zero or negative jut get the first message.  But not the one
+ * with id ch_block_id.
  * Return OK when found and return the value in "rettv".
  * Return FAIL otherwise.
  */
     static int
 channel_get_json(int ch_idx, int id, typval_T **rettv)
 {
-    jsonq_T *head = &channels[ch_idx].ch_json_head;
-    jsonq_T *item = head->next;
+    channel_T *channel = &channels[ch_idx];
+    jsonq_T   *head = &channel->ch_json_head;
+    jsonq_T   *item = head->next;
 
     while (item != head)
     {
@@ -806,7 +810,8 @@ channel_get_json(int ch_idx, int id, typval_T **rettv)
 	typval_T    *tv = &l->lv_first->li_tv;
 
 	if ((id > 0 && tv->v_type == VAR_NUMBER && tv->vval.v_number == id)
-	      || id <= 0)
+	      || (id <= 0 && (tv->v_type != VAR_NUMBER
+			       || tv->vval.v_number != channel->ch_block_id)))
 	{
 	    *rettv = item->value;
 	    remove_json_node(item);
@@ -1316,15 +1321,20 @@ channel_read_block(int idx)
     int
 channel_read_json_block(int ch_idx, int id, typval_T **rettv)
 {
-    int  more;
+    int		more;
+    channel_T	*channel = &channels[ch_idx];
 
+    channel->ch_block_id = id;
     for (;;)
     {
 	more = channel_parse_json(ch_idx);
 
 	/* search for messsage "id" */
 	if (channel_get_json(ch_idx, id, rettv) == OK)
+	{
+	    channel->ch_block_id = 0;
 	    return OK;
+	}
 
 	if (!more)
 	{
@@ -1334,13 +1344,13 @@ channel_read_json_block(int ch_idx, int id, typval_T **rettv)
 		continue;
 
 	    /* Wait for up to the channel timeout. */
-	    if (channels[ch_idx].ch_fd < 0
-			|| channel_wait(channels[ch_idx].ch_fd,
-					 channels[ch_idx].ch_timeout) == FAIL)
+	    if (channel->ch_fd < 0 || channel_wait(channel->ch_fd,
+						 channel->ch_timeout) == FAIL)
 		break;
 	    channel_read(ch_idx);
 	}
     }
+    channel->ch_block_id = 0;
     return FAIL;
 }
 

src/eval.c

@@ -10611,7 +10611,7 @@ f_diff_hlID(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
     static void
 f_empty(typval_T *argvars, typval_T *rettv)
 {
-    int		n;
+    int		n = FALSE;
 
     switch (argvars[0].v_type)
     {
@@ -19962,7 +19962,7 @@ f_trunc(typval_T *argvars, typval_T *rettv)
     static void
 f_type(typval_T *argvars, typval_T *rettv)
 {
-    int n;
+    int n = -1;
 
     switch (argvars[0].v_type)
     {
@@ -24979,7 +24979,7 @@ write_viminfo_varlist(FILE *fp)
     hashitem_T	*hi;
     dictitem_T	*this_var;
     int		todo;
-    char	*s;
+    char	*s = "";
     char_u	*p;
     char_u	*tofree;
     char_u	numbuf[NUMBUFLEN];

src/testdir/test_channel.py

@@ -133,7 +133,7 @@ class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler):
                     elif decoded[1] == '!quit!':
                         # we're done
                         self.server.shutdown()
-                        break
+                        return
                     elif decoded[1] == '!crash!':
                         # Crash!
                         42 / 0

src/version.c

@@ -762,6 +762,12 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1293,
+/**/
+    1292,
+/**/
+    1291,
 /**/
     1290,
 /**/