commit 7bcb30e91387800261c0154c2d53b6118100dca0
author Bram Moolenaar <Bram@vim.org> Wed Apr 03 21:14:29 2013 +0200
committer Bram Moolenaar <Bram@vim.org> Wed Apr 03 21:14:29 2013 +0200
tree 6b7d1b6c0cb7003626e7b7fe0af3a7b33e022091
parent cdffbeae2b031160a479f24cfedacab926938e5d

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

src/search.c

diff --git a/src/search.c b/src/search.c
index 934e4b0..f9a5b84 100644
--- a/src/search.c
+++ b/src/search.c
@@ -727,7 +727,7 @@
 					++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 @@
 		    /* 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))
 		    {

src/testdir/test14.in

diff --git a/src/testdir/test14.in b/src/testdir/test14.in
index b6f2f57..ebcb58c 100644
--- a/src/testdir/test14.in
+++ b/src/testdir/test14.in
@@ -44,6 +44,9 @@
 :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 @@
 foobar
 
 
+one two
 search()

src/testdir/test14.ok

diff --git a/src/testdir/test14.ok b/src/testdir/test14.ok
index fb795a8..1fd8916 100644
--- a/src/testdir/test14.ok
+++ b/src/testdir/test14.ok
@@ -19,3 +19,4 @@
 0
 1
 1
+two

src/version.c

diff --git a/src/version.c b/src/version.c
index a68eb13..ce12628 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    877,
+/**/
     876,
 /**/
     875,