Mercurial > vim
changeset 1557:811f29447aea v7.1.270
updated for version 7.1-270
author | vimboss |
---|---|
date | Mon, 10 Mar 2008 20:34:59 +0000 |
parents | 1c597397f006 |
children | 2c4ca49319a6 |
files | src/ex_docmd.c src/search.c src/version.c |
diffstat | 3 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- a/src/search.c +++ b/src/search.c @@ -538,7 +538,10 @@ searchit(win, buf, pos, dir, pat, count, 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. */