Merge remote-tracking branch 'vim/master'

Author: splhack

.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

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;

src/version.c

@@ -779,6 +779,10 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    77,
+/**/
+    76,
 /**/
     75,
 /**/