updated for version 7.4.532

Problem:    When using 'incsearch' "2/pattern/e" highlights the first match.
Solution:   Move the code to set extra_col inside the loop for count.  (Ozaki
            Kiichi)

diff --git a/src/search.c b/src/search.c
index 283e77867ed32554bc7a18ffdfe3ac513ee5da96..047a733972e8fb6e044ea3891c5bca3b8879ced4 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -552,6 +552,7 @@ searchit(win, buf, pos, dir, pat, count, options, pat_use, stop_lnum, tm)
     int                match_ok;
     long       nmatched;
     int                submatch = 0;
+    int                first_match = TRUE;
     int                save_called_emsg = called_emsg;
 #ifdef FEAT_SEARCH_EXTRA
     int                break_loop = FALSE;
@@ -565,33 +566,33 @@ searchit(win, buf, pos, dir, pat, count, options, pat_use, stop_lnum, tm)
        return FAIL;
     }
 
-    /* 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. */
-    else if (dir != BACKWARD && has_mbyte
-                   && pos->lnum >= 1 && pos->lnum <= buf->b_ml.ml_line_count
-                                                    && pos->col < MAXCOL - 2)
-    {
-       ptr = ml_get_buf(buf, pos->lnum, FALSE) + pos->col;
-       if (*ptr == NUL)
-           extra_col = 1;
-       else
-           extra_col = (*mb_ptr2len)(ptr);
-    }
-#endif
-    else
-       extra_col = 1;
-
     /*
      * find the string
      */
     called_emsg = FALSE;
     do /* loop for count */
     {
+       /* 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. */
+       else if (dir != BACKWARD && has_mbyte
+                    && pos->lnum >= 1 && pos->lnum <= buf->b_ml.ml_line_count
+                                                    && pos->col < MAXCOL - 2)
+       {
+           ptr = ml_get_buf(buf, pos->lnum, FALSE) + pos->col;
+           if (*ptr == NUL)
+               extra_col = 1;
+           else
+               extra_col = (*mb_ptr2len)(ptr);
+       }
+#endif
+       else
+           extra_col = 1;
+
        start_pos = *pos;       /* remember start pos for detecting no match */
        found = 0;              /* default: not found */
        at_first_line = TRUE;   /* default: start in first line */
@@ -677,7 +678,7 @@ searchit(win, buf, pos, dir, pat, count, options, pat_use, stop_lnum, tm)
                         * otherwise "/$" will get stuck on end of line.
                         */
                        while (matchpos.lnum == 0
-                               && ((options & SEARCH_END)
+                               && ((options & SEARCH_END) && first_match
                                    ?  (nmatched == 1
                                        && (int)endpos.col - 1
                                             < (int)start_pos.col + extra_col)
@@ -908,6 +909,7 @@ searchit(win, buf, pos, dir, pat, count, options, pat_use, stop_lnum, tm)
                    pos->coladd = 0;
 #endif
                    found = 1;
+                   first_match = FALSE;
 
                    /* Set variables used for 'incsearch' highlighting. */
                    search_match_lines = endpos.lnum - matchpos.lnum;

diff --git a/src/version.c b/src/version.c
index 38acd5da2d7938f0cfdea0882c6f7c00088c53bd..fd7c4146927cea6e2b674f8640de3281c9946533 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    532,
 /**/
     531,
 /**/