patch 8.0.0446: the ";" command does not work after some characters

Problem:    The ";" command does not work after characters with a lower byte
            that is NUL.
Solution:   Properly check for not having a previous character. (Hirohito
            Higashi)

diff --git a/src/Makefile b/src/Makefile
index 02388364a28b640cef49160b6847e1ca7c86a77c..1af1e17aae45609282016193c760b59a61f43d36 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2099,6 +2099,7 @@ test_arglist \
        test_cdo \
        test_channel \
        test_charsearch \
+       test_charsearch_utf8 \
        test_changedtick \
        test_cindent \
        test_cmdline \

diff --git a/src/search.c b/src/search.c
index d23dde2c88e743e26b68c6f6028f93b7c0ed331c..f4a5c6dcd17ebaeb11f0da80b037641a466d2706 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -1643,7 +1643,11 @@ searchc(cmdarg_T *cap, int t_cmd)
     }
     else               /* repeat previous search */
     {
-       if (*lastc == NUL)
+       if (*lastc == NUL
+#ifdef FEAT_MBYTE
+               && lastc_bytelen == 1
+#endif
+               )
            return FAIL;
        if (dir)        /* repeat in opposite direction */
            dir = -lastcdir;

diff --git a/src/testdir/test_alot_utf8.vim b/src/testdir/test_alot_utf8.vim
index 3022da334840653be089ee5afaacd927d193e4e6..13724cbd4afa5fc372be1307fe3576b31760deb8 100644 (file)
--- a/src/testdir/test_alot_utf8.vim
+++ b/src/testdir/test_alot_utf8.vim
@@ -6,6 +6,7 @@
 " files, so that they can be run by themselves.
 
 set belloff=all
+source test_charsearch_utf8.vim
 source test_expr_utf8.vim
 source test_matchadd_conceal_utf8.vim
 source test_regexp_utf8.vim

diff --git a/src/testdir/test_charsearch_utf8.vim b/src/testdir/test_charsearch_utf8.vim
new file mode 100644 (file)
index 0000000..b700a8c
--- /dev/null
+++ b/src/testdir/test_charsearch_utf8.vim
@@ -0,0 +1,44 @@
+" Tests for related f{char} and t{char} using utf-8.
+if !has('multi_byte')
+  finish
+endif
+
+" Test for t,f,F,T movement commands
+function! Test_search_cmds()
+  new!
+  call setline(1, "・最初から最後まで最強のVimは最高")
+  1
+  normal! f最
+  call assert_equal([0, 1, 4, 0], getpos('.'))
+  normal! ;
+  call assert_equal([0, 1, 16, 0], getpos('.'))
+  normal! 2;
+  call assert_equal([0, 1, 43, 0], getpos('.'))
+  normal! ,
+  call assert_equal([0, 1, 28, 0], getpos('.'))
+  bw!
+endfunction
+
+" vim: shiftwidth=2 sts=2 expandtab
+" Tests for related f{char} and t{char} using utf-8.
+if !has('multi_byte')
+  finish
+endif
+
+" Test for t,f,F,T movement commands
+function! Test_search_cmds()
+  new!
+  call setline(1, "・最初から最後まで最強のVimは最高")
+  1
+  normal! f最
+  call assert_equal([0, 1, 4, 0], getpos('.'))
+  normal! ;
+  call assert_equal([0, 1, 16, 0], getpos('.'))
+  normal! 2;
+  call assert_equal([0, 1, 43, 0], getpos('.'))
+  normal! ,
+  call assert_equal([0, 1, 28, 0], getpos('.'))
+  bw!
+endfunction
+
+" vim: shiftwidth=2 sts=2 expandtab

diff --git a/src/version.c b/src/version.c
index 7a0d500b47e9f89cd7e6174381c07c1d26bd0923..cb416dcf90f2112d1a537b7c210bfd160b2447e5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,10 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    446,
+/**/
+    446,
 /**/
     445,
 /**/