projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| ad28a8ff AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: patch 7.1.025 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.1.025 | |
| 11 | Problem: search() and searchpos() don't use match under cursor at start of | |
| 12 | line when using 'bc' flags. (Viktor Kojouharov) | |
| 13 | Solution: Don't go to the previous line when the 'c' flag is present. | |
| 14 | Also fix that "j" doesn't move the cursor to the right column. | |
| 15 | Files: src/eval.c, src/search.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-7.1.024/src/eval.c Tue Jun 19 17:23:46 2007 | |
| 19 | --- src/eval.c Thu Jul 5 21:16:31 2007 | |
| 20 | *************** | |
| 21 | *** 13925,13930 **** | |
| 22 | --- 13925,13932 ---- | |
| 23 | /* If 'n' flag is used: restore cursor position. */ | |
| 24 | if (flags & SP_NOMOVE) | |
| 25 | curwin->w_cursor = save_cursor; | |
| 26 | + else | |
| 27 | + curwin->w_set_curswant = TRUE; | |
| 28 | theend: | |
| 29 | p_ws = save_p_ws; | |
| 30 | ||
| 31 | *** ../vim-7.1.024/src/search.c Tue Jul 10 13:07:08 2007 | |
| 32 | --- src/search.c Thu Jul 5 21:18:55 2007 | |
| 33 | *************** | |
| 34 | *** 573,580 **** | |
| 35 | /* | |
| 36 | * Start searching in current line, unless searching backwards and | |
| 37 | * we're in column 0. | |
| 38 | */ | |
| 39 | ! if (dir == BACKWARD && start_pos.col == 0) | |
| 40 | { | |
| 41 | lnum = pos->lnum - 1; | |
| 42 | at_first_line = FALSE; | |
| 43 | --- 573,584 ---- | |
| 44 | /* | |
| 45 | * Start searching in current line, unless searching backwards and | |
| 46 | * we're in column 0. | |
| 47 | + * If we are searching backwards, in column 0, and not including the | |
| 48 | + * current position, gain some efficiency by skipping back a line. | |
| 49 | + * Otherwise begin the search in the current line. | |
| 50 | */ | |
| 51 | ! if (dir == BACKWARD && start_pos.col == 0 | |
| 52 | ! && (options & SEARCH_START) == 0) | |
| 53 | { | |
| 54 | lnum = pos->lnum - 1; | |
| 55 | at_first_line = FALSE; | |
| 56 | *** ../vim-7.1.024/src/version.c Tue Jul 10 13:07:08 2007 | |
| 57 | --- src/version.c Tue Jul 10 13:26:13 2007 | |
| 58 | *************** | |
| 59 | *** 668,669 **** | |
| 60 | --- 668,671 ---- | |
| 61 | { /* Add new patch number below this line */ | |
| 62 | + /**/ | |
| 63 | + 25, | |
| 64 | /**/ | |
| 65 | ||
| 66 | -- | |
| 67 | SIGFUN -- signature too funny (core dumped) | |
| 68 | ||
| 69 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 70 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 71 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 72 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |