summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/version.c2
-rwxr-xr-xsrc/vimtutor24
2 files changed, 16 insertions, 10 deletions
diff --git a/src/version.c b/src/version.c
index b94783c3d..bfb8cca01 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 30,
+/**/
29,
/**/
28,
diff --git a/src/vimtutor b/src/vimtutor
index 2fbb1371f..731b1ef23 100755
--- a/src/vimtutor
+++ b/src/vimtutor
@@ -39,18 +39,22 @@ export TUTORCOPY
# remove the copy of the tutor on exit
trap "rm -rf $TODELETE" 0 1 2 3 9 11 13 15
-# Vim could be called "vim" or "vi". Also check for "vim6", for people who
-# have Vim 5.x installed as "vim" and Vim 6.0 as "vim6".
-testvim=`which vim6 2>/dev/null`
-if test -f "$testvim"; then
- VIM=vim6
-else
- testvim=`which vim`
+# Vim could be called "vim" or "vi". Also check for "vimN", for people who
+# have Vim installed with its version number.
+# We anticipate up to a future Vim 8 version :-).
+seq="vim vim8 vim75 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi"
+for i in $seq; do
+ testvim=`which $i 2>/dev/null`
if test -f "$testvim"; then
- VIM=vim
- else
- VIM=vi
+ VIM=$i
+ break
fi
+done
+
+# When no Vim version was found fall back to "vim", you'll get an error message
+# below.
+if test -z "$VIM"; then
+ VIM=vim
fi
# Use Vim to copy the tutor, it knows the value of $VIMRUNTIME