diff --git a/7.2.422 b/7.2.422 new file mode 100644 index 0000000..bb7791e --- /dev/null +++ b/7.2.422 @@ -0,0 +1,67 @@ +To: vim-dev@vim.org +Subject: Patch 7.2.422 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.2.422 +Problem: May get E763 when using spell dictionaries. +Solution: Avoid utf-8 case folded character to be truncated to 8 bits and + differ from latin1. (Dominique Pelle) +Files: src/spell.c + + +*** ../vim-7.2.421/src/spell.c 2010-01-19 13:06:42.000000000 +0100 +--- src/spell.c 2010-05-13 17:29:28.000000000 +0200 +*************** +*** 9780,9789 **** + { + for (i = 128; i < 256; ++i) + { + spelltab.st_isu[i] = utf_isupper(i); + spelltab.st_isw[i] = spelltab.st_isu[i] || utf_islower(i); +! spelltab.st_fold[i] = utf_fold(i); +! spelltab.st_upper[i] = utf_toupper(i); + } + } + else +--- 9780,9795 ---- + { + for (i = 128; i < 256; ++i) + { ++ int f = utf_fold(i); ++ int u = utf_toupper(i); ++ + spelltab.st_isu[i] = utf_isupper(i); + spelltab.st_isw[i] = spelltab.st_isu[i] || utf_islower(i); +! /* The folded/upper-cased value is different between latin1 and +! * utf8 for 0xb5, causing E763 for no good reason. Use the latin1 +! * value for utf-8 to avoid this. */ +! spelltab.st_fold[i] = (f < 256) ? f : i; +! spelltab.st_upper[i] = (u < 256) ? u : i; + } + } + else +*** ../vim-7.2.421/src/version.c 2010-05-13 17:35:52.000000000 +0200 +--- src/version.c 2010-05-13 17:46:03.000000000 +0200 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 422, + /**/ + +-- +Q. What happens to programmers when they die? +A: MS-Windows programmers are reinstalled. C++ programmers become undefined, + anyone who refers to them will die as well. Java programmers reincarnate + after being garbage collected. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ download, build and distribute -- http://www.A-A-P.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/README.patches b/README.patches index f7cd4f0..6ae690e 100644 --- a/README.patches +++ b/README.patches @@ -448,3 +448,9 @@ Individual patches for Vim 7.2: 2558 7.2.414 CTRK-K does not produce 0xa0 as expected 2122 7.2.415 Win32: Can't open a remote file when starting Vim 2757 7.2.416 logtalk.dict is not installed + 2262 7.2.417 if 'shell' has arg with a slash 'shellpipe' is not correct + 3048 7.2.418 Vim sets background or foreground color in a terminal to -1 + 1471 7.2.419 memory leak in Motif when clicking on "Search Vim Help" + 2792 7.2.420 ":argedit" does not accept "++enc=utf8" as documented + 2108 7.2.421 when folds are not updated there is no way to force an update + 2174 7.2.422 may get E763 when using spell dictionaries diff --git a/vim.spec b/vim.spec index 68ed07f..bed7ff1 100644 --- a/vim.spec +++ b/vim.spec @@ -18,7 +18,7 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim72%{?beta} -%define patchlevel 416 +%define patchlevel 422 Summary: The VIM editor URL: http://www.vim.org/ @@ -482,6 +482,12 @@ Patch413: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.413 Patch414: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.414 Patch415: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.415 Patch416: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.416 +Patch417: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.417 +Patch418: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.418 +Patch419: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.419 +Patch420: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.420 +Patch421: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.421 +Patch422: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.422 Patch3000: vim-7.0-syntax.patch Patch3002: vim-7.1-nowarnings.patch @@ -1036,6 +1042,12 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch414 -p0 %patch415 -p0 %patch416 -p0 +%patch417 -p0 +%patch418 -p0 +%patch419 -p0 +%patch420 -p0 +%patch421 -p0 +%patch422 -p0 # install spell files @@ -1500,6 +1512,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/* %changelog +* Thu May 13 2010 Karsten Hopp 7.2.422-1 +- patchlevel 422 + * Fri May 07 2010 Karsten Hopp 7.2.416-1 - patchlevel 416