diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-03-10 20:34:59 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-03-10 20:34:59 +0000 |
| commit | aad8664d070532790e127028e0fc772a1ae6b30e (patch) | |
| tree | dd562d554a6bc11a0d7c829688caad75989aa285 | |
| parent | f2b2e70b3b58a9549fa38b6323459e9063bb6f03 (diff) | |
| download | vim-git-7.1.270.tar.gz | |
updated for version 7.1-270v7.1.270
| -rw-r--r-- | src/ex_docmd.c | 6 | ||||
| -rw-r--r-- | src/search.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index d5692c273..193796f47 100644 --- 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 diff --git a/src/search.c b/src/search.c index 9bdd03796..ff952d745 100644 --- a/src/search.c +++ b/src/search.c @@ -538,7 +538,10 @@ searchit(win, buf, pos, dir, pat, count, options, pat_use, stop_lnum, tm) 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. */ diff --git a/src/version.c b/src/version.c index 654c5d990..bc906d453 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 */ /**/ + 270, +/**/ 269, /**/ 268, |