updated for version 7.1-270

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index d5692c273c2770ad171d0f61b0848785f5f5e399..193796f474b91aa03d6969714be34b95c5ee7490 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3932,8 +3932,7 @@ get_address(ptr, skip, to_other_file)
                                curwin->w_cursor.col = 0;
                            searchcmdlen = 0;
                            if (!do_search(NULL, c, cmd, 1L,
-                                       SEARCH_HIS + SEARCH_MSG + SEARCH_START,
-                                       NULL))
+                                              SEARCH_HIS | SEARCH_MSG, NULL))
                            {
                                curwin->w_cursor = pos;
                                cmd = NULL;
@@ -3980,8 +3979,7 @@ get_address(ptr, skip, to_other_file)
                                pos.col = 0;
                            if (searchit(curwin, curbuf, &pos,
                                        *cmd == '?' ? BACKWARD : FORWARD,
-                                       (char_u *)"", 1L,
-                                       SEARCH_MSG + SEARCH_START,
+                                       (char_u *)"", 1L, SEARCH_MSG,
                                                i, (linenr_T)0, NULL) != FAIL)
                                lnum = pos.lnum;
                            else

diff --git a/src/search.c b/src/search.c
index 9bdd037963e97cc34f93edb06ef7feef75751183..ff952d745ece99901e44e8896b0386f954854f26 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -538,7 +538,10 @@ searchit(win, buf, pos, dir, pat, count, options, pat_use, stop_lnum, tm)
        return FAIL;
     }
 
-    if (options & SEARCH_START)
+    /* When not accepting a match at the start position set "extra_col" to a
+     * non-zero value.  Don't do that when starting at MAXCOL, since MAXCOL +
+     * 1 is zero. */
+    if ((options & SEARCH_START) || pos->col == MAXCOL)
        extra_col = 0;
 #ifdef FEAT_MBYTE
     /* Watch out for the "col" being MAXCOL - 2, used in a closed fold. */

diff --git a/src/version.c b/src/version.c
index 654c5d990d4e6e1ff34a1d7b808434efe3849bb5..bc906d453c65303c06b9285806c03cdcaf7cb4ca 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    270,
 /**/
     269,
 /**/