Mercurial > vim
annotate src/vimtutor @ 34686:83875247fbc0 v9.1.0224
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text
Commit: https://github.com/vim/vim/commit/515f734e687f28f7199b2a8042197624d9f3ec15
Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Date: Thu Mar 28 12:01:14 2024 +0100
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text
Problem: If a line has "right" & "below" virtual text properties,
where the "below" property may be stored first due to lack of
ordering between them, then the line height is calculated to
be 1 more and causes the cursor to far over the line.
Solution: Remove some unnecessary setting of a
`next_right_goes_below = TRUE` flag for "below" and "above"
text properties. (Dylan Thacker-Smith)
I modified a regression test I recently added to cover this case,
leveraging the fact that "after", "right" & "below" text properties are
being stored in the reverse of the order they are added in. The
previous version of this regression test was crafted to workaround this
issue so it can be addressed by this separate patch.
closes: #14317
Signed-off-by: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 28 Mar 2024 12:15:03 +0100 |
| parents | d4faa2c5211b |
| children |
| rev | line source |
|---|---|
| 25700 | 1 #!/bin/sh |
| 7 | 2 |
| 3 # Start Vim on a copy of the tutor file. | |
| 4 | |
| 1582 | 5 # Usage: vimtutor [-g] [xx] |
| 6 # Where optional argument -g starts vimtutor in gvim (GUI) instead of vim. | |
| 7 # and xx is a language code like "es" or "nl". | |
| 7 | 8 # When an argument is given, it tries loading that tutor. |
| 9 # When this fails or no argument was given, it tries using 'v:lang' | |
| 10 # When that also fails, it uses the English version. | |
| 11 | |
| 1582 | 12 # Vim could be called "vim" or "vi". Also check for "vimN", for people who |
| 13 # have Vim installed with its version number. | |
|
10214
3a6b2d4c71d6
commit https://github.com/vim/vim/commit/bbe917d9d465a66a29e38879c7f66df51b0b0dc3
Christian Brabandt <cb@256bit.org>
parents:
1582
diff
changeset
|
14 # We anticipate up to a future Vim 8.1 version :-). |
|
3a6b2d4c71d6
commit https://github.com/vim/vim/commit/bbe917d9d465a66a29e38879c7f66df51b0b0dc3
Christian Brabandt <cb@256bit.org>
parents:
1582
diff
changeset
|
15 seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" |
| 25700 | 16 if test "$1" = "-g"; then |
| 17 # Try to use the GUI version of Vim if possible, it will fall back | |
| 18 # on Vim if Gvim is not installed. | |
| 19 seq="gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" | |
| 20 shift | |
| 1582 | 21 fi |
| 22 | |
| 7 | 23 xx=$1 |
| 24 export xx | |
| 25 | |
| 26 # We need a temp file for the copy. First try using a standard command. | |
| 27 tmp="${TMPDIR-/tmp}" | |
| 28 TUTORCOPY=`mktemp $tmp/tutorXXXXXX || tempfile -p tutor || echo none` | |
| 29 | |
| 30 # If the standard commands failed then create a directory to put the copy in. | |
| 31 # That is a secure way to make a temp file. | |
| 32 if test "$TUTORCOPY" = none; then | |
| 33 tmpdir=$tmp/vimtutor$$ | |
| 34 OLD_UMASK=`umask` | |
| 35 umask 077 | |
| 36 getout=no | |
| 37 mkdir $tmpdir || getout=yes | |
| 38 umask $OLD_UMASK | |
| 39 if test $getout = yes; then | |
| 40 echo "Could not create directory for tutor copy, exiting." | |
| 41 exit 1 | |
| 42 fi | |
| 43 TUTORCOPY=$tmpdir/tutorcopy | |
| 44 touch $TUTORCOPY | |
| 45 TODELETE=$tmpdir | |
| 46 else | |
| 47 TODELETE=$TUTORCOPY | |
| 48 fi | |
| 49 | |
| 50 export TUTORCOPY | |
| 51 | |
| 52 # remove the copy of the tutor on exit | |
| 53 trap "rm -rf $TODELETE" 0 1 2 3 9 11 13 15 | |
| 54 | |
| 1316 | 55 for i in $seq; do |
| 25700 | 56 testvim=$(which $i 2>/dev/null) |
| 57 if test -f "$testvim"; then | |
| 58 VIM=$i | |
| 59 break | |
| 60 fi | |
| 1316 | 61 done |
| 62 | |
| 63 # When no Vim version was found fall back to "vim", you'll get an error message | |
| 64 # below. | |
| 65 if test -z "$VIM"; then | |
| 25700 | 66 VIM=vim |
| 7 | 67 fi |
| 68 | |
| 69 # Use Vim to copy the tutor, it knows the value of $VIMRUNTIME | |
| 70 # The script tutor.vim tells Vim which file to copy | |
| 1582 | 71 $VIM -f -u NONE -c 'so $VIMRUNTIME/tutor/tutor.vim' |
| 7 | 72 |
|
13662
5eac31544dd0
patch 8.0.1703: in the tutor 'showcmd' is not set
Christian Brabandt <cb@256bit.org>
parents:
10214
diff
changeset
|
73 # Start vim without any .vimrc, set 'nocompatible' and 'showcmd' |
| 25700 | 74 $VIM -f -u NONE -c "set nocp showcmd" "$TUTORCOPY" |