projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| baa3863f ER |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.1.238 | |
| 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.238 | |
| 11 | Problem: Using the 'c' flag with searchpair() may cause it to fail. Using | |
| 12 | the 'r' flag doesn't work when 'wrapscan' is set. (A.Politz) | |
| 13 | Solution: Only use the 'c' flag for the first search, not for repeating. | |
| 14 | When using 'r' imply 'W'. (Antony Scriven) | |
| 15 | Files: src/eval.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-7.1.237/src/eval.c Sat Jan 12 16:45:25 2008 | |
| 19 | --- src/eval.c Tue Jan 22 11:42:28 2008 | |
| 20 | *************** | |
| 21 | *** 14189,14194 **** | |
| 22 | --- 14189,14198 ---- | |
| 23 | goto theend; | |
| 24 | } | |
| 25 | ||
| 26 | + /* Using 'r' implies 'W', otherwise it doesn't work. */ | |
| 27 | + if (flags & SP_REPEAT) | |
| 28 | + p_ws = FALSE; | |
| 29 | + | |
| 30 | /* Optional fifth argument: skip expression */ | |
| 31 | if (argvars[3].v_type == VAR_UNKNOWN | |
| 32 | || argvars[4].v_type == VAR_UNKNOWN) | |
| 33 | *************** | |
| 34 | *** 14344,14349 **** | |
| 35 | --- 14348,14356 ---- | |
| 36 | incl(&pos); | |
| 37 | } | |
| 38 | foundpos = pos; | |
| 39 | + | |
| 40 | + /* clear the start flag to avoid getting stuck here */ | |
| 41 | + options &= ~SEARCH_START; | |
| 42 | ||
| 43 | /* If the skip pattern matches, ignore this match. */ | |
| 44 | if (*skip != NUL) | |
| 45 | *** ../vim-7.1.237/src/version.c Tue Jan 22 11:06:06 2008 | |
| 46 | --- src/version.c Tue Jan 22 11:57:28 2008 | |
| 47 | *************** | |
| 48 | *** 668,669 **** | |
| 49 | --- 668,671 ---- | |
| 50 | { /* Add new patch number below this line */ | |
| 51 | + /**/ | |
| 52 | + 238, | |
| 53 | /**/ | |
| 54 | ||
| 55 | -- | |
| 56 | To keep milk from turning sour: Keep it in the cow. | |
| 57 | ||
| 58 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 59 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 60 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 61 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |