summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_search.vim21
-rw-r--r--src/version.c2
2 files changed, 22 insertions, 1 deletions
diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim
index 93b68a78a..9769fb262 100644
--- a/src/testdir/test_search.vim
+++ b/src/testdir/test_search.vim
@@ -608,7 +608,7 @@ func Test_search_cmdline6()
endfunc
func Test_search_cmdline7()
- " Test that an pressing <c-g> in an empty command line
+ " Test that pressing <c-g> in an empty command line
" does not move the cursor
CheckOption incsearch
@@ -1642,6 +1642,25 @@ func Test_search_smartcase()
set ignorecase& smartcase&
close!
+endfun
+
+" Test 'smartcase' with utf-8.
+func Test_search_smartcase_utf8()
+ new
+ let save_enc = &encoding
+ set encoding=utf8 ignorecase smartcase
+
+ call setline(1, 'Café cafÉ')
+ 1s/café/x/g
+ call assert_equal('x x', getline(1))
+
+ call setline(1, 'Café cafÉ')
+ 1s/cafÉ/x/g
+ call assert_equal('Café x', getline(1))
+
+ set ignorecase& smartcase&
+ let &encoding = save_enc
+ close!
endfunc
" Test searching past the end of a file
diff --git a/src/version.c b/src/version.c
index fe9b78720..6a5f19951 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1296,
+/**/
1295,
/**/
1294,