]>
Commit | Line | Data |
---|---|---|
d6adf2d5 AM |
1 | --- vim-8.2.3570/src/vimtutor.orig 2021-11-02 20:05:13.183015908 +0100 |
2 | +++ vim-8.2.3570/src/vimtutor 2021-11-02 20:07:12.539682552 +0100 | |
d9a10acf ER |
3 | @@ -9,14 +9,12 @@ |
4 | # When this fails or no argument was given, it tries using 'v:lang' | |
5 | # When that also fails, it uses the English version. | |
742968eb | 6 | |
cc598b93 AG |
7 | -# Vim could be called "vim" or "vi". Also check for "vimN", for people who |
8 | -# have Vim installed with its version number. | |
0811e4c2 AM |
9 | -# We anticipate up to a future Vim 8.1 version :-). |
10 | -seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" | |
cc598b93 | 11 | +# Vim could be called "vim" or "vi". |
9421d938 | 12 | +seq="/usr/bin/vim.heavy /usr/bin/vim /bin/vi" |
d6adf2d5 AM |
13 | if test "$1" = "-g"; then |
14 | # Try to use the GUI version of Vim if possible, it will fall back | |
15 | # on Vim if Gvim is not installed. | |
16 | - seq="gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" | |
17 | + 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" | |
18 | shift | |
d9a10acf | 19 | fi |
742968eb | 20 | |
d6adf2d5 | 21 | @@ -53,8 +51,7 @@ export TUTORCOPY |
d9a10acf ER |
22 | trap "rm -rf $TODELETE" 0 1 2 3 9 11 13 15 |
23 | ||
24 | for i in $seq; do | |
d6adf2d5 AM |
25 | - testvim=$(which $i 2>/dev/null) |
26 | - if test -f "$testvim"; then | |
27 | + if test -x "$i"; then | |
28 | VIM=$i | |
29 | break | |
30 | fi |