From 79cbdcb1eeead00bad6fc64ab4a53e5860d5a663 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 11 Nov 2016 21:14:03 +0100 Subject: [PATCH 1/2] patch 8.0.0076 Problem: Channel log has double parens ()(). Solution: Remove () for write_buf_line. (Yasuhiro Matsumoto) --- src/channel.c | 9 +++++++-- src/version.c | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/channel.c b/src/channel.c index 16156ce419..aa82d717d4 100644 --- a/src/channel.c +++ b/src/channel.c @@ -1341,7 +1341,7 @@ write_buf_line(buf_T *buf, linenr_T lnum, channel_T *channel) p[len] = NL; p[len + 1] = NUL; - channel_send(channel, PART_IN, p, len + 1, "write_buf_line()"); + channel_send(channel, PART_IN, p, len + 1, "write_buf_line"); vim_free(p); } @@ -3450,7 +3450,12 @@ channel_handle_events(void) * Return FAIL or OK. */ int -channel_send(channel_T *channel, ch_part_T part, char_u *buf, int len, char *fun) +channel_send( + channel_T *channel, + ch_part_T part, + char_u *buf, + int len, + char *fun) { int res; sock_T fd; diff --git a/src/version.c b/src/version.c index ce19c0c132..1707ec4ed4 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 76, /**/ 75, /**/ From e3505dfc858260a21f2bbc6056f5769dea2f273d Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 11 Nov 2016 21:57:45 +0100 Subject: [PATCH 2/2] patch 8.0.0077 Problem: The GUI code is not tested by Travis. Solution: Install the virtual framebuffer. --- .travis.yml | 6 ++++++ src/version.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0acbf90ea0..e9464aec97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,6 +69,12 @@ before_install: # Lua is not installed on Travis OSX - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install lua; export LUA_PREFIX=/usr/local; fi +# Start virtual framebuffer to be able to test the GUI. +before_script: + - "export DISPLAY=:99.0" + - "sh -e /etc/init.d/xvfb start" + - sleep 3 # give xvfb some time to start + script: - NPROC=$(getconf _NPROCESSORS_ONLN) - if [ "$CHECK_AUTOCONF" = "yes" -a "$CC" = "gcc" ]; then make -C src autoconf; fi diff --git a/src/version.c b/src/version.c index 1707ec4ed4..9f3810ef84 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 77, /**/ 76, /**/