Mercurial > vim
view runtime/spell/tet/main.aap @ 35308:22c03485f222 v9.1.0456
patch 9.1.0456: Left shift is incorrect with vartabstop and shiftwidth=0
Commit: https://github.com/vim/vim/commit/88d4f255b7b7a19bb4f6489e0ad0956e47d51fed
Author: Gary Johnson <garyjohn@spocom.com>
Date: Sat Jun 1 20:51:33 2024 +0200
patch 9.1.0456: Left shift is incorrect with vartabstop and shiftwidth=0
Problem: Left shift is incorrect with vartabstop and shiftwidth=0
Solution: make tabstop_at() function aware of shift direction
(Gary Johnson)
The problem was that with 'vartabstop' set and 'shiftwidth' equal 0,
left shifts using << were shifting the line to the wrong column. The
tabstop to the right of the first character in the line was being used
as the shift amount instead of the tabstop to the left of that first
character.
The reason was that the tabstop_at() function always returned the value
of the tabstop to the right of the given column and was not accounting
for the direction of the shift.
The solution was to make tabstop_at() aware of the direction of the
shift and to choose the tabtop accordingly.
A test was added to check this behavior and make sure it doesn't
regress.
While at it, also fix a few indentation/alignment issues.
fixes: #14864
closes: #14887
Signed-off-by: Gary Johnson <garyjohn@spocom.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 01 Jun 2024 21:00:03 +0200 |
| parents | bdda48f01a68 |
| children |
line wrap: on
line source
# Aap recipe for Tetum Vim spell files. # Use a freshly compiled Vim if it exists. @if os.path.exists('../../../src/vim'): VIM = ../../../src/vim @else: :progsearch VIM vim SPELLDIR = .. FILES = tet_ID.aff tet_ID.dic # I don't have a Tetum locale, use the Dutch one instead. all: $SPELLDIR/tet.latin1.spl $SPELLDIR/tet.utf-8.spl ../README_tet.txt $SPELLDIR/tet.latin1.spl : $FILES :sys env LANG=nl_NL.ISO8859-1 $VIM -u NONE -e -c "mkspell! $SPELLDIR/tet tet_ID" -c q $SPELLDIR/tet.utf-8.spl : $FILES :sys env LANG=nl_NL.UTF-8 $VIM -u NONE -e -c "mkspell! $SPELLDIR/tet tet_ID" -c q ../README_tet.txt : README_tet_ID.txt :copy $source $target # # Fetching the files from OpenOffice.org. # OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries :attr {fetch = $OODIR/%file%} tet_ID.zip # The files don't depend on the .zip file so that we can delete it. # Only download the zip file if the targets don't exist. tet_ID.aff tet_ID.dic: {buildcheck=} :assertpkg unzip patch :fetch tet_ID.zip :sys $UNZIP tet_ID.zip :delete tet_ID.zip @if not os.path.exists('tet_ID.orig.aff'): :copy tet_ID.aff tet_ID.orig.aff @if not os.path.exists('tet_ID.orig.dic'): :copy tet_ID.dic tet_ID.orig.dic @if os.path.exists('tet_ID.diff'): :sys patch <tet_ID.diff # Generate diff files, so that others can get the OpenOffice files and apply # the diffs to get the Vim versions. diff: :assertpkg diff :sys {force} diff -a -C 1 tet_ID.orig.aff tet_ID.aff >tet_ID.diff :sys {force} diff -a -C 1 tet_ID.orig.dic tet_ID.dic >>tet_ID.diff # Check for updated OpenOffice spell files. When there are changes the # ".new.aff" and ".new.dic" files are left behind for manual inspection. check: :assertpkg unzip diff :fetch tet_ID.zip :mkdir tmp :cd tmp @try: @import stat :sys $UNZIP ../tet_ID.zip :sys {force} diff ../tet_ID.orig.aff tet_ID.aff >d @if os.stat('d')[stat.ST_SIZE] > 0: :copy tet_ID.aff ../tet_ID.new.aff :sys {force} diff ../tet_ID.orig.dic tet_ID.dic >d @if os.stat('d')[stat.ST_SIZE] > 0: :copy tet_ID.dic ../tet_ID.new.dic @finally: :cd .. :delete {r}{f}{q} tmp :delete tet_ID.zip # vim: set sts=4 sw=4 :