Mirror of the Vim source from https://github.com/vim/vim
Revisión | 811f29447aea27adaf1f54879ddf0fbd05a1e094 (tree) |
---|---|
Tiempo | 2008-03-11 05:34:59 |
Autor | vimboss |
Commiter | vimboss |
updated for version 7.1-270
@@ -3932,8 +3932,7 @@ | ||
3932 | 3932 | curwin->w_cursor.col = 0; |
3933 | 3933 | searchcmdlen = 0; |
3934 | 3934 | if (!do_search(NULL, c, cmd, 1L, |
3935 | - SEARCH_HIS + SEARCH_MSG + SEARCH_START, | |
3936 | - NULL)) | |
3935 | + SEARCH_HIS | SEARCH_MSG, NULL)) | |
3937 | 3936 | { |
3938 | 3937 | curwin->w_cursor = pos; |
3939 | 3938 | cmd = NULL; |
@@ -3980,8 +3979,7 @@ | ||
3980 | 3979 | pos.col = 0; |
3981 | 3980 | if (searchit(curwin, curbuf, &pos, |
3982 | 3981 | *cmd == '?' ? BACKWARD : FORWARD, |
3983 | - (char_u *)"", 1L, | |
3984 | - SEARCH_MSG + SEARCH_START, | |
3982 | + (char_u *)"", 1L, SEARCH_MSG, | |
3985 | 3983 | i, (linenr_T)0, NULL) != FAIL) |
3986 | 3984 | lnum = pos.lnum; |
3987 | 3985 | else |
@@ -538,7 +538,10 @@ | ||
538 | 538 | return FAIL; |
539 | 539 | } |
540 | 540 | |
541 | - if (options & SEARCH_START) | |
541 | + /* When not accepting a match at the start position set "extra_col" to a | |
542 | + * non-zero value. Don't do that when starting at MAXCOL, since MAXCOL + | |
543 | + * 1 is zero. */ | |
544 | + if ((options & SEARCH_START) || pos->col == MAXCOL) | |
542 | 545 | extra_col = 0; |
543 | 546 | #ifdef FEAT_MBYTE |
544 | 547 | /* Watch out for the "col" being MAXCOL - 2, used in a closed fold. */ |
@@ -667,6 +667,8 @@ | ||
667 | 667 | static int included_patches[] = |
668 | 668 | { /* Add new patch number below this line */ |
669 | 669 | /**/ |
670 | + 270, | |
671 | +/**/ | |
670 | 672 | 269, |
671 | 673 | /**/ |
672 | 674 | 268, |