updated for version 7.1-025

diff --git a/src/eval.c b/src/eval.c
index ac4dc1bb511d0145857a3c3450d495bcecf121e5..d55ba10ae9b3470a2da4a4adb4dc248cacaf4c63 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -13925,6 +13925,8 @@ search_cmn(argvars, match_pos, flagsp)
     /* If 'n' flag is used: restore cursor position. */
     if (flags & SP_NOMOVE)
        curwin->w_cursor = save_cursor;
+    else
+       curwin->w_set_curswant = TRUE;
 theend:
     p_ws = save_p_ws;
 

diff --git a/src/search.c b/src/search.c
index 3836db716265d587505bef9b98e227dcf60857ad..ee1aef597a5648d78f2912883dee5cfb56e16a6b 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -573,8 +573,12 @@ searchit(win, buf, pos, dir, pat, count, options, pat_use, stop_lnum)
        /*
         * Start searching in current line, unless searching backwards and
         * we're in column 0.
+        * If we are searching backwards, in column 0, and not including the
+        * current position, gain some efficiency by skipping back a line.
+        * Otherwise begin the search in the current line.
         */
-       if (dir == BACKWARD && start_pos.col == 0)
+       if (dir == BACKWARD && start_pos.col == 0
+                                            && (options & SEARCH_START) == 0)
        {
            lnum = pos->lnum - 1;
            at_first_line = FALSE;

diff --git a/src/version.c b/src/version.c
index 4a3f666eb4f3a960d195614a5520c3ec0c9dee32..83ff53d967fbc114d92173735fa2b4e6c79ee503 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 */
+/**/
+    25,
 /**/
     24,
 /**/