Merge branch 'use-trusty'

k-takata · k-takata · commit 42d79c8903c6 · 2017-02-04T23:23:31.000+09:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,6 @@
 language: go
-go: 1.5
+go: 1.7.3
+dist: trusty
 sudo: false
 
 env:
diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@ html:
 	cp -R syntax target/html
 	cp doc/*.jax vim_faq/*.jax target/html/doc
 	cp tools/buildhtml.vim tools/makehtml.vim target/html
-	-cd target/html/doc ; vim -c "set rtp^=../../../tools" -eu ../buildhtml.vim -c "qall!"
+	-cd target/html/doc ; vim -eu ../buildhtml.vim -c "qall!"
 
 clean:
 	rm -rf target
diff --git a/tools/syntax/help.vim b/tools/syntax/help.vim
