Mirror of the Vim source from https://github.com/vim/vim
Revision | b686fb4898d1fd8579e5bf61f36c2a08fee85a20 (tree) |
---|---|
Zeit | 2007-07-10 20:28:55 |
Autor | vimboss |
Commiter | vimboss |
updated for version 7.1-025
@@ -13925,6 +13925,8 @@ | ||
13925 | 13925 | /* If 'n' flag is used: restore cursor position. */ |
13926 | 13926 | if (flags & SP_NOMOVE) |
13927 | 13927 | curwin->w_cursor = save_cursor; |
13928 | + else | |
13929 | + curwin->w_set_curswant = TRUE; | |
13928 | 13930 | theend: |
13929 | 13931 | p_ws = save_p_ws; |
13930 | 13932 |
@@ -573,8 +573,12 @@ | ||
573 | 573 | /* |
574 | 574 | * Start searching in current line, unless searching backwards and |
575 | 575 | * we're in column 0. |
576 | + * If we are searching backwards, in column 0, and not including the | |
577 | + * current position, gain some efficiency by skipping back a line. | |
578 | + * Otherwise begin the search in the current line. | |
576 | 579 | */ |
577 | - if (dir == BACKWARD && start_pos.col == 0) | |
580 | + if (dir == BACKWARD && start_pos.col == 0 | |
581 | + && (options & SEARCH_START) == 0) | |
578 | 582 | { |
579 | 583 | lnum = pos->lnum - 1; |
580 | 584 | at_first_line = FALSE; |
@@ -667,6 +667,8 @@ | ||
667 | 667 | static int included_patches[] = |
668 | 668 | { /* Add new patch number below this line */ |
669 | 669 | /**/ |
670 | + 25, | |
671 | +/**/ | |
670 | 672 | 24, |
671 | 673 | /**/ |
672 | 674 | 23, |