updated for version 7.3.877

Problem:    Forward searching with search() is broken.
Solution:   Fix it and add tests. (Sung Pae)

diff --git a/src/search.c b/src/search.c
index 934e4b0cff3e2b8db950e8bcaa1d988ad9298a08..f9a5b84c030820b32cd2510c5841b2cbeb3796cb 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -727,7 +727,7 @@ searchit(win, buf, pos, dir, pat, count, options, pat_use, stop_lnum, tm)
                                        ++matchcol;
                                }
                            }
-                           if (options & SEARCH_START)
+                           if (matchcol == 0 && (options & SEARCH_START))
                                break;
                            if (ptr[matchcol] == NUL
                                    || (nmatched = vim_regexec_multi(&regmatch,
@@ -869,7 +869,7 @@ searchit(win, buf, pos, dir, pat, count, options, pat_use, stop_lnum, tm)
                    /* With the SEARCH_END option move to the last character
                     * of the match.  Don't do it for an empty match, end
                     * should be same as start then. */
-                   if (options & SEARCH_END && !(options & SEARCH_NOOF)
+                   if ((options & SEARCH_END) && !(options & SEARCH_NOOF)
                            && !(matchpos.lnum == endpos.lnum
                                && matchpos.col == endpos.col))
                    {

diff --git a/src/testdir/test14.in b/src/testdir/test14.in
index b6f2f57605c8ceae4f63bf81728ba20cac17f8a3..ebcb58c9d05e056c1ce8fec2082178a0f7c879f7 100644 (file)
--- a/src/testdir/test14.in
+++ b/src/testdir/test14.in
@@ -44,6 +44,9 @@ j:call search('^$', 'c')
 :call append(line('$'), line('.') - startline)
 :call search('^$', 'bc')
 :call append(line('$'), line('.') - startline)
+/two
+:call search('.', 'c')
+:call append(line('$'), getline('.')[col('.') - 1:])
 :/^search()/,$w >>test.out
 :qa!
 ENDTEST
@@ -79,4 +82,5 @@ Piece of Java
 foobar
 
 
+one two
 search()

diff --git a/src/testdir/test14.ok b/src/testdir/test14.ok
index fb795a81ced624d04a35af8c44b2765283d808a4..1fd89165e1163461fe0d4391dd637e050f02fbfd 100644 (file)
--- a/src/testdir/test14.ok
+++ b/src/testdir/test14.ok
@@ -19,3 +19,4 @@ search()
 0
 1
 1
+two

diff --git a/src/version.c b/src/version.c
index a68eb13d54e12821291a961fa0a2bdc152348fae..ce12628ad106daf970301e59fa7aeca81bde108a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    877,
 /**/
     876,
 /**/