diff --git a/.travis.yml b/.travis.yml index 459be2f1e2..124bacbf23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,12 @@ before_install: - brew install python3 - brew install lua +# 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) - ./configure $CONFOPT --enable-fail-if-missing diff --git a/src/channel.c b/src/channel.c index 829afa9561..8c68f0e07d 100644 --- a/src/channel.c +++ b/src/channel.c @@ -1362,7 +1362,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); } @@ -3475,7 +3475,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 4e4b252ee1..dc88813b55 100644 --- a/src/version.c +++ b/src/version.c @@ -779,6 +779,10 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 77, +/**/ + 76, /**/ 75, /**/