Mercurial > vim
annotate runtime/spell/fr/main.aap @ 32743:df63fa700fc6 v9.0.1691
patch 9.0.1691: wrong viewport restored for incsearch and smoothscroll
Commit: https://github.com/vim/vim/commit/7b7b4cb6f274e7bace127107b0d2752133c4020b
Author: zeertzjq <zeertzjq@outlook.com>
Date: Fri Aug 11 23:48:27 2023 +0200
patch 9.0.1691: wrong viewport restored for incsearch and smoothscroll
Problem: wrong viewport restored for incsearch and smoothscroll
Solution: Save and restore skipcol as well
closes: #12713
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 12 Aug 2023 00:00:05 +0200 |
| parents | ea3c3f13385c |
| children |
| rev | line source |
|---|---|
| 446 | 1 # Aap recipe for French Vim spell files. |
| 388 | 2 |
| 3 # Use a freshly compiled Vim if it exists. | |
| 4 @if os.path.exists('../../../src/vim'): | |
| 5 VIM = ../../../src/vim | |
| 6 @else: | |
| 454 | 7 :progsearch VIM vim |
| 388 | 8 |
| 9 SPELLDIR = .. | |
| 10 FILES = fr_FR.aff fr_FR.dic | |
| 11 | |
| 481 | 12 all: $SPELLDIR/fr.latin1.spl $SPELLDIR/fr.utf-8.spl ../README_fr.txt |
| 388 | 13 |
| 1618 | 14 # The spell file is iso-8859-15, but Vim normally uses "latin1" for this. |
| 15 # This is OK for the utf-8 files, but for latin1 we need to avoid the "oe" | |
| 16 # character. When unpacking we create four files: | |
| 17 # fr_FR_latin1.aff modified file | |
| 18 # fr_FR_latin1.dic modified file | |
| 19 # fr_FR_iso15.aff original file (after applying diff) | |
| 20 # fr_FR_iso15.dic original file (after applying diff) | |
| 21 # Just before using the dictionary files, the right ones are copied to | |
| 22 # fr_FR.aff | |
| 23 # fr_FR.dic | |
| 24 | |
| 482 | 25 $SPELLDIR/fr.latin1.spl : $FILES |
| 1618 | 26 :copy {force} fr_FR_latin1.aff fr_FR.aff |
| 27 :copy {force} fr_FR_latin1.dic fr_FR.dic | |
|
2292
ea3c3f13385c
Update spell files for Ubuntu locale names.
Bram Moolenaar <bram@vim.org>
parents:
1618
diff
changeset
|
28 :sys env LANG=fr_FR.ISO-8859-15@euro |
| 481 | 29 $VIM -u NONE -e -c "mkspell! $SPELLDIR/fr fr_FR" -c q |
| 388 | 30 |
| 482 | 31 $SPELLDIR/fr.utf-8.spl : $FILES |
| 1618 | 32 :copy {force} fr_FR_iso15.aff fr_FR.aff |
| 33 :copy {force} fr_FR_iso15.dic fr_FR.dic | |
| 388 | 34 :sys env LANG=fr_FR.UTF-8 |
| 481 | 35 $VIM -u NONE -e -c "mkspell! $SPELLDIR/fr fr_FR" -c q |
| 388 | 36 |
| 539 | 37 ../README_fr.txt : README_fr_FR.txt |
| 502 | 38 :cat $source >!$target |
| 388 | 39 |
| 40 # | |
| 1618 | 41 # Used to fetch the files from OpenOffice.org. Those are old. |
| 42 # Later versions are elsewhere. | |
| 388 | 43 # |
| 1618 | 44 #OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries |
| 45 ZIPFILE = http://dico.savant.free.fr/_download/fr_FR_1-1-6.zip | |
| 46 | |
| 47 :attr {fetch = $ZIPFILE} fr_FR.zip | |
| 388 | 48 |
| 49 # The files don't depend on the .zip file so that we can delete it. | |
| 50 # Only download the zip file if the targets don't exist. | |
| 51 fr_FR.aff fr_FR.dic: {buildcheck=} | |
| 52 :assertpkg unzip patch | |
| 53 :fetch fr_FR.zip | |
| 481 | 54 :sys $UNZIP fr_FR.zip |
| 388 | 55 :delete fr_FR.zip |
| 56 @if not os.path.exists('fr_FR.orig.aff'): | |
| 481 | 57 :copy fr_FR.aff fr_FR.orig.aff |
| 388 | 58 @if not os.path.exists('fr_FR.orig.dic'): |
| 481 | 59 :copy fr_FR.dic fr_FR.orig.dic |
| 454 | 60 @if os.path.exists('fr_FR.diff'): |
| 61 :sys patch <fr_FR.diff | |
| 388 | 62 |
| 1618 | 63 # Keep the unmodified files (after diff) for ISO-8859-15. |
| 64 :copy fr_FR.aff fr_FR_iso15.aff | |
| 65 :copy fr_FR.dic fr_FR_iso15.dic | |
| 66 # For the latin1 .dic file change all the "oe" characters to the two | |
| 67 # characters "oe". | |
| 68 :sys $VIM -u NONE -e -c "set enc=latin1" | |
| 69 -c "e fr_FR.dic" | |
| 70 -c "%s/½/oe/g" | |
| 71 -c "w! fr_FR_latin1.dic" | |
| 72 -c q | |
| 73 # For the latin1 .aff file delete all the "oe" and "OE" characters and | |
| 74 # delete the REP lines with those characters. | |
| 75 :sys $VIM -u NONE -e -c "set enc=latin1" | |
| 76 -c "e fr_FR.aff" | |
| 77 -c "%s/½//g" | |
| 78 -c "%s/¼//g" | |
| 79 -c "%g/REP.*oe/d" | |
| 80 -c "w! fr_FR_latin1.aff" | |
| 81 -c q | |
| 82 | |
| 388 | 83 |
| 84 # Generate diff files, so that others can get the OpenOffice files and apply | |
| 85 # the diffs to get the Vim versions. | |
| 1618 | 86 # This uses the iso-8859-15 files. |
| 388 | 87 diff: |
| 88 :assertpkg diff | |
| 1618 | 89 :copy {force} fr_FR_iso15.aff fr_FR.aff |
| 90 :copy {force} fr_FR_iso15.dic fr_FR.dic | |
| 388 | 91 :sys {force} diff -a -C 1 fr_FR.orig.aff fr_FR.aff >fr_FR.diff |
| 92 :sys {force} diff -a -C 1 fr_FR.orig.dic fr_FR.dic >>fr_FR.diff | |
| 93 | |
| 1618 | 94 # Delete all the unpacked and generated files, including the "orig" files. |
| 95 clean: | |
| 96 :delete {force} fr_FR.zip fr_FR.aff fr_FR.dic | |
| 97 fr_FR.aff.orig fr_FR.dic.orig | |
| 98 fr_FR.orig.aff fr_FR.orig.dic | |
| 99 fr_FR_latin1.aff fr_FR_latin1.dic | |
| 100 fr_FR_iso15.aff fr_FR_iso15.dic | |
| 101 README_fr_FR.txt | |
| 388 | 102 |
| 103 # Check for updated OpenOffice spell files. When there are changes the | |
| 104 # ".new.aff" and ".new.dic" files are left behind for manual inspection. | |
| 105 | |
| 106 check: | |
| 107 :assertpkg unzip diff | |
| 108 :fetch fr_FR.zip | |
| 109 :mkdir tmp | |
| 110 :cd tmp | |
| 111 @try: | |
| 112 @import stat | |
| 481 | 113 :sys $UNZIP ../fr_FR.zip |
| 388 | 114 :sys {force} diff ../fr_FR.orig.aff fr_FR.aff >d |
| 115 @if os.stat('d')[stat.ST_SIZE] > 0: | |
| 116 :copy fr_FR.aff ../fr_FR.new.aff | |
| 117 :sys {force} diff ../fr_FR.orig.dic fr_FR.dic >d | |
| 118 @if os.stat('d')[stat.ST_SIZE] > 0: | |
| 119 :copy fr_FR.dic ../fr_FR.new.dic | |
| 120 @finally: | |
| 121 :cd .. | |
| 122 :delete {r}{f}{q} tmp | |
| 123 :delete fr_FR.zip | |
| 124 | |
| 125 | |
| 126 # vim: set sts=4 sw=4 : |