Merge remote-tracking branch 'origin/master' into run-vint-on-travis

Author: tyru

.travis.yml

@@ -25,6 +25,7 @@ jobs:
       - VIM_VERSION=installed
       - MAKE_TARGET="clean_compiled check checkpy js/test py/test test/node_position/test_position.out"
       - TEST_PROFILE=vim-profile-installed.txt
+      - TEST_PYTHON=python3
       - RUN_VINT=true
 
 install:

Makefile

@@ -25,8 +25,9 @@ test:
 js/test: js/vimlparser.js
 	test/run_command.sh node js/vimlparser.js
 
+py/test: TEST_PYTHON?=python
 py/test: py/vimlparser.py
-	test/run_command.sh python py/vimlparser.py
+	test/run_command.sh $(TEST_PYTHON) py/vimlparser.py
 
 test/node_position/test_position.out: test/node_position/test_position.vim test/node_position/test_position.ok
 	vim -Nu test/vimrc -S test/node_position/test_position.vim