---- ./src/vimtutor~ 2005-12-30 03:36:48.000000000 +0200
-+++ ./src/vimtutor 2006-03-05 14:16:46.590263101 +0200
-@@ -39,18 +39,11 @@
- # remove the copy of the tutor on exit
- trap "rm -rf $TODELETE" 0 1 2 3 9 11 13 15
+--- vim71/src/vimtutor~ 2008-05-29 22:14:57.000000000 +0300
++++ vim71/src/vimtutor 2008-05-29 22:24:29.118736307 +0300
+@@ -9,14 +9,12 @@
+ # When this fails or no argument was given, it tries using 'v:lang'
+ # When that also fails, it uses the English version.
--# 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
+-# 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"
+# Vim could be called "vim" or "vi".
-+if [ -x /usr/bin/vim ]; then
-+ VIM=vim
- else
-- testvim=`which vim`
-- if test -f "$testvim"; then
-- VIM=vim
-- else
-- VIM=vi
-- fi
-+ VIM=vi
++seq="/usr/bin/vim.heavy /usr/bin/vim /bin/vi"
+ if test "$1" = "-g"; then
+ # Try to use the GUI version of Vim if possible, it will fall back
+ # on Vim if Gvim is not installed.
+- seq="gvim gvim8 gvim75 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq"
++ seq="/usr/bin/gvim /usr/bin/gvim.heavy /usr/bin/gvim.athena /usr/bin/gvim.gnome /usr/bin/gvim.gtk /usr/bin/gvim.motif $seq"
+ shift
fi
- # Use Vim to copy the tutor, it knows the value of $VIMRUNTIME
+@@ -53,8 +51,7 @@
+ trap "rm -rf $TODELETE" 0 1 2 3 9 11 13 15
+
+ for i in $seq; do
+- testvim=`which $i 2>/dev/null`
+- if test -f "$testvim"; then
++ if test -x "$i"; then
+ VIM=$i
+ break
+ fi