From 5f5e203c92365ac6399de3663637b73bf9fb6dfa Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 14 Dec 2018 15:47:03 +0100 Subject: [PATCH] patch 8.1.0584: with search CTRL-L does not pick up composing characters Problem: With search CTRL-L does not pick up composing characters. Solution: Check for composing characters. (Christian Brabandt, closes #3682) [code change was accidentally included in 8.1.0579] --- src/testdir/test_search.vim | 22 ++++++++++++++++++++++ src/version.c | 2 ++ 2 files changed, 24 insertions(+) diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim index eadb128e0..3c83dd197 100644 --- a/src/testdir/test_search.vim +++ b/src/testdir/test_search.vim @@ -1154,3 +1154,25 @@ func Test_no_last_substitute_pat() call delete('Xviminfo') endfunc + +func Test_search_Ctrl_L_combining() + " Make sure, that Ctrl-L works correctly with combining characters. + " It uses an artificial example of an 'a' with 4 combining chars: + " 'a' U+0061 Dec:97 LATIN SMALL LETTER A a /\%u61\Z "\u0061" + " ' ̀' U+0300 Dec:768 COMBINING GRAVE ACCENT ̀ /\%u300\Z "\u0300" + " ' ́' U+0301 Dec:769 COMBINING ACUTE ACCENT ́ /\%u301\Z "\u0301" + " ' ̇' U+0307 Dec:775 COMBINING DOT ABOVE ̇ /\%u307\Z "\u0307" + " ' Ì£' U+0323 Dec:803 COMBINING DOT BELOW ̣ /\%u323 "\u0323" + " Those should also appear on the commandline + if !has('multi_byte') || !exists('+incsearch') + return + endif + call Cmdline3_prep() + 1 + let bufcontent = ['', 'Miạ̀́̇m'] + call append('$', bufcontent) + call feedkeys("/Mi\\\", 'tx') + call assert_equal(5, line('.')) + call assert_equal(bufcontent[1], @/) + call Incsearch_cleanup() +endfunc diff --git a/src/version.c b/src/version.c index 1c85bf1f6..a25f262b8 100644 --- a/src/version.c +++ b/src/version.c @@ -799,6 +799,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 584, /**/ 583, /**/ -- 2.40.0