projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| ef75664d AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.1.270 | |
| 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.270 | |
| 11 | Problem: ":?foo?" matches in current line since patch 7.1.025. (A.Politz) | |
| 12 | Solution: Remove the SEARCH_START flag. | |
| 13 | Files: src/ex_docmd.c, src/search.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.1.269/src/ex_docmd.c Tue Feb 26 21:29:06 2008 | |
| 17 | --- src/ex_docmd.c Sun Mar 2 20:50:43 2008 | |
| 18 | *************** | |
| 19 | *** 3932,3939 **** | |
| 20 | curwin->w_cursor.col = 0; | |
| 21 | searchcmdlen = 0; | |
| 22 | if (!do_search(NULL, c, cmd, 1L, | |
| 23 | ! SEARCH_HIS + SEARCH_MSG + SEARCH_START, | |
| 24 | ! NULL)) | |
| 25 | { | |
| 26 | curwin->w_cursor = pos; | |
| 27 | cmd = NULL; | |
| 28 | --- 3932,3938 ---- | |
| 29 | curwin->w_cursor.col = 0; | |
| 30 | searchcmdlen = 0; | |
| 31 | if (!do_search(NULL, c, cmd, 1L, | |
| 32 | ! SEARCH_HIS | SEARCH_MSG, NULL)) | |
| 33 | { | |
| 34 | curwin->w_cursor = pos; | |
| 35 | cmd = NULL; | |
| 36 | *************** | |
| 37 | *** 3980,3987 **** | |
| 38 | pos.col = 0; | |
| 39 | if (searchit(curwin, curbuf, &pos, | |
| 40 | *cmd == '?' ? BACKWARD : FORWARD, | |
| 41 | ! (char_u *)"", 1L, | |
| 42 | ! SEARCH_MSG + SEARCH_START, | |
| 43 | i, (linenr_T)0, NULL) != FAIL) | |
| 44 | lnum = pos.lnum; | |
| 45 | else | |
| 46 | --- 3979,3985 ---- | |
| 47 | pos.col = 0; | |
| 48 | if (searchit(curwin, curbuf, &pos, | |
| 49 | *cmd == '?' ? BACKWARD : FORWARD, | |
| 50 | ! (char_u *)"", 1L, SEARCH_MSG, | |
| 51 | i, (linenr_T)0, NULL) != FAIL) | |
| 52 | lnum = pos.lnum; | |
| 53 | else | |
| 54 | *** ../vim-7.1.269/src/search.c Wed Feb 20 13:41:14 2008 | |
| 55 | --- src/search.c Sun Mar 2 22:00:50 2008 | |
| 56 | *************** | |
| 57 | *** 538,544 **** | |
| 58 | return FAIL; | |
| 59 | } | |
| 60 | ||
| 61 | ! if (options & SEARCH_START) | |
| 62 | extra_col = 0; | |
| 63 | #ifdef FEAT_MBYTE | |
| 64 | /* Watch out for the "col" being MAXCOL - 2, used in a closed fold. */ | |
| 65 | --- 538,547 ---- | |
| 66 | return FAIL; | |
| 67 | } | |
| 68 | ||
| 69 | ! /* When not accepting a match at the start position set "extra_col" to a | |
| 70 | ! * non-zero value. Don't do that when starting at MAXCOL, since MAXCOL + | |
| 71 | ! * 1 is zero. */ | |
| 72 | ! if ((options & SEARCH_START) || pos->col == MAXCOL) | |
| 73 | extra_col = 0; | |
| 74 | #ifdef FEAT_MBYTE | |
| 75 | /* Watch out for the "col" being MAXCOL - 2, used in a closed fold. */ | |
| 76 | *** ../vim-7.1.269/src/version.c Sun Mar 9 16:45:16 2008 | |
| 77 | --- src/version.c Mon Mar 10 21:32:07 2008 | |
| 78 | *************** | |
| 79 | *** 668,669 **** | |
| 80 | --- 668,671 ---- | |
| 81 | { /* Add new patch number below this line */ | |
| 82 | + /**/ | |
| 83 | + 270, | |
| 84 | /**/ | |
| 85 | ||
| 86 | -- | |
| 87 | hundred-and-one symptoms of being an internet addict: | |
| 88 | 102. When filling out your driver's license application, you give | |
| 89 | your IP address. | |
| 90 | ||
| 91 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 92 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 93 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 94 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |