projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| ad28a8ff AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: patch 7.1.030 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.1.030 | |
| 11 | Problem: The "vimtutor" shell script checks for "vim6" but not for "vim7". | |
| 12 | (Christian Robinson) | |
| 13 | Solution: Check for more versions, but prefer using "vim". | |
| 14 | Files: src/vimtutor | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.1.029/src/vimtutor Sun Jun 13 20:37:33 2004 | |
| 18 | --- src/vimtutor Sun Jul 8 17:16:29 2007 | |
| 19 | *************** | |
| 20 | *** 39,56 **** | |
| 21 | # remove the copy of the tutor on exit | |
| 22 | trap "rm -rf $TODELETE" 0 1 2 3 9 11 13 15 | |
| 23 | ||
| 24 | ! # Vim could be called "vim" or "vi". Also check for "vim6", for people who | |
| 25 | ! # have Vim 5.x installed as "vim" and Vim 6.0 as "vim6". | |
| 26 | ! testvim=`which vim6 2>/dev/null` | |
| 27 | ! if test -f "$testvim"; then | |
| 28 | ! VIM=vim6 | |
| 29 | ! else | |
| 30 | ! testvim=`which vim` | |
| 31 | if test -f "$testvim"; then | |
| 32 | ! VIM=vim | |
| 33 | ! else | |
| 34 | ! VIM=vi | |
| 35 | fi | |
| 36 | fi | |
| 37 | ||
| 38 | # Use Vim to copy the tutor, it knows the value of $VIMRUNTIME | |
| 39 | --- 39,60 ---- | |
| 40 | # remove the copy of the tutor on exit | |
| 41 | trap "rm -rf $TODELETE" 0 1 2 3 9 11 13 15 | |
| 42 | ||
| 43 | ! # Vim could be called "vim" or "vi". Also check for "vimN", for people who | |
| 44 | ! # have Vim installed with its version number. | |
| 45 | ! # We anticipate up to a future Vim 8 version :-). | |
| 46 | ! seq="vim vim8 vim75 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" | |
| 47 | ! for i in $seq; do | |
| 48 | ! testvim=`which $i 2>/dev/null` | |
| 49 | if test -f "$testvim"; then | |
| 50 | ! VIM=$i | |
| 51 | ! break | |
| 52 | fi | |
| 53 | + done | |
| 54 | + | |
| 55 | + # When no Vim version was found fall back to "vim", you'll get an error message | |
| 56 | + # below. | |
| 57 | + if test -z "$VIM"; then | |
| 58 | + VIM=vim | |
| 59 | fi | |
| 60 | ||
| 61 | # Use Vim to copy the tutor, it knows the value of $VIMRUNTIME | |
| 62 | *** ../vim-7.1.029/src/version.c Mon Jul 16 20:38:56 2007 | |
| 63 | --- src/version.c Tue Jul 17 14:30:51 2007 | |
| 64 | *************** | |
| 65 | *** 668,669 **** | |
| 66 | --- 668,671 ---- | |
| 67 | { /* Add new patch number below this line */ | |
| 68 | + /**/ | |
| 69 | + 30, | |
| 70 | /**/ | |
| 71 | ||
| 72 | -- | |
| 73 | BLACK KNIGHT: I'm invincible! | |
| 74 | ARTHUR: You're a looney. | |
| 75 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
| 76 | ||
| 77 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 78 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 79 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 80 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |