diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/msgpack_rpc/channel.c | 26 | ||||
| -rw-r--r-- | src/nvim/testdir/test100.in | 6 | ||||
| -rw-r--r-- | src/nvim/testdir/test72.in | 1 | ||||
| -rw-r--r-- | src/nvim/version.c | 26 |
4 files changed, 40 insertions, 19 deletions
diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c index c8f8252e6d..920274f850 100644 --- a/src/nvim/msgpack_rpc/channel.c +++ b/src/nvim/msgpack_rpc/channel.c @@ -442,17 +442,18 @@ static void handle_request(Channel *channel, msgpack_object *request) if (error.set) { // Validation failed, send response with error - channel_write(channel, - serialize_response(channel->id, - request_id, - &error, - NIL, - &out_buffer)); - char buf[256]; - snprintf(buf, sizeof(buf), - "Channel %" PRIu64 " sent an invalid message, closing.", - channel->id); - call_set_error(channel, buf); + if (channel_write(channel, + serialize_response(channel->id, + request_id, + &error, + NIL, + &out_buffer))) { + char buf[256]; + snprintf(buf, sizeof(buf), + "Channel %" PRIu64 " sent an invalid message, closing.", + channel->id); + call_set_error(channel, buf); + } return; } @@ -619,8 +620,7 @@ static void unsubscribe(Channel *channel, char *event) free(event_string); } -/// Close the channel streams/job. The channel resources will be freed by -/// free_channel later. +/// Close the channel streams/job and free the channel resources. static void close_channel(Channel *channel) { if (channel->closed) { diff --git a/src/nvim/testdir/test100.in b/src/nvim/testdir/test100.in index 083b4324b2..bc1a55e4d3 100644 --- a/src/nvim/testdir/test100.in +++ b/src/nvim/testdir/test100.in @@ -18,7 +18,7 @@ STARTTEST :call FillBuffer() :earlier 10 :call UndoLevel() -:set ft=unix +:set ff=unix :%w! test.out :new two :0put ='TWO: expecting global undolevels: 5, local undolevels: 2 (first) then 10 (afterwards)' @@ -28,7 +28,7 @@ STARTTEST :call UndoLevel() :setlocal ul=10 :call UndoLevel() -:set ft=unix +:set ff=unix :%w >> test.out :wincmd p :redir >>test.out | echo "global value shouldn't be changed and still be 5!" | echo 'ONE: expecting global undolevels: 5, local undolevels: -123456 (default)'|:setglobal undolevels? | echon ' global' | setlocal undolevels? | echon ' local' |echo "" |redir end @@ -37,7 +37,7 @@ STARTTEST :1put ='global value should be changed to 50' :2put ='THREE: expecting global undolevels: 50, local undolevels: -123456 (default)' :call UndoLevel() -:set ft=unix +:set ff=unix :%w >> test.out :"sleep 10 :" diff --git a/src/nvim/testdir/test72.in b/src/nvim/testdir/test72.in index 20897f01a0..912fa19ba6 100644 --- a/src/nvim/testdir/test72.in +++ b/src/nvim/testdir/test72.in @@ -8,7 +8,6 @@ STARTTEST :" Test 'undofile': first a simple one-line change. :set visualbell :set ul=100 undofile nomore -:set ft=unix :e! Xtestfile ggdGithis is one line:set ul=100 :s/one/ONE/ diff --git a/src/nvim/version.c b/src/nvim/version.c index 83dc3c700b..b0bd38b7de 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -178,6 +178,28 @@ static char *(features[]) = { }; static int included_patches[] = { + //589 NA + //588, + //587, + //586 NA + //585, + //584 NA + //583 NA + //582, + //581, + //580, + //579, + //578, + //577, + //576, + //575, + //574, + //573, + //572, + //571 NA + //570 NA + //569, + //568, 567, //566, //565, @@ -245,7 +267,7 @@ static int included_patches[] = { //503, //502, //501 NA - //500, + 500, 499, //498 NA //497, @@ -294,7 +316,7 @@ static int included_patches[] = { 454, //453 NA 452, - //451, + //451 NA 450, 449, //448 NA |