From 7a42fa3cb7b61dcfa63a9083f8840dd38ead272b Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 10 Jul 2007 11:28:55 +0000 Subject: updated for version 7.1-025 --- src/eval.c | 2 ++ src/search.c | 6 +++++- src/version.c | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/eval.c b/src/eval.c index ac4dc1bb5..d55ba10ae 100644 --- 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 3836db716..ee1aef597 100644 --- 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 4a3f666eb..83ff53d96 100644 --- 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, /**/ -- cgit v1.2.1