diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-07-10 11:28:55 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-07-10 11:28:55 +0000 |
| commit | 7a42fa3cb7b61dcfa63a9083f8840dd38ead272b (patch) | |
| tree | 1221df8b00aad3ed6ddeafdfaa664f7ee8ce0604 | |
| parent | aec1179e5e5e2b575547b0050dcf77a44af1c9f9 (diff) | |
| download | vim-git-7a42fa3cb7b61dcfa63a9083f8840dd38ead272b.tar.gz | |
updated for version 7.1-025v7.1.025
| -rw-r--r-- | src/eval.c | 2 | ||||
| -rw-r--r-- | src/search.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 1 deletions
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 @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 25, +/**/ 24, /**/ 23, |