projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 7fd9e930 ER |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.135 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.3.135 | |
| 11 | Problem: When there is no previous substitute pattern, the previous search | |
| 12 | pattern is used. The other way around doesn't work. | |
| 13 | Solution: When there is no previous search pattern, use the previous | |
| 14 | substitute pattern if possible. (Christian Brabandt) | |
| 15 | Files: src/search.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-7.3.134/src/search.c 2010-09-21 16:56:29.000000000 +0200 | |
| 19 | --- src/search.c 2011-02-25 18:36:56.000000000 +0100 | |
| 20 | *************** | |
| 21 | *** 1161,1172 **** | |
| 22 | { | |
| 23 | if (spats[RE_SEARCH].pat == NULL) /* no previous pattern */ | |
| 24 | { | |
| 25 | ! EMSG(_(e_noprevre)); | |
| 26 | ! retval = 0; | |
| 27 | ! goto end_do_search; | |
| 28 | } | |
| 29 | - /* make search_regcomp() use spats[RE_SEARCH].pat */ | |
| 30 | - searchstr = (char_u *)""; | |
| 31 | } | |
| 32 | ||
| 33 | if (pat != NULL && *pat != NUL) /* look for (new) offset */ | |
| 34 | --- 1161,1180 ---- | |
| 35 | { | |
| 36 | if (spats[RE_SEARCH].pat == NULL) /* no previous pattern */ | |
| 37 | { | |
| 38 | ! pat = spats[RE_SUBST].pat; | |
| 39 | ! if (pat == NULL) | |
| 40 | ! { | |
| 41 | ! EMSG(_(e_noprevre)); | |
| 42 | ! retval = 0; | |
| 43 | ! goto end_do_search; | |
| 44 | ! } | |
| 45 | ! searchstr = pat; | |
| 46 | ! } | |
| 47 | ! else | |
| 48 | ! { | |
| 49 | ! /* make search_regcomp() use spats[RE_SEARCH].pat */ | |
| 50 | ! searchstr = (char_u *)""; | |
| 51 | } | |
| 52 | } | |
| 53 | ||
| 54 | if (pat != NULL && *pat != NUL) /* look for (new) offset */ | |
| 55 | *************** | |
| 56 | *** 4527,4533 **** | |
| 57 | #if defined(FEAT_FIND_ID) || defined(PROTO) | |
| 58 | /* | |
| 59 | * Find identifiers or defines in included files. | |
| 60 | ! * if p_ic && (compl_cont_status & CONT_SOL) then ptr must be in lowercase. | |
| 61 | */ | |
| 62 | void | |
| 63 | find_pattern_in_path(ptr, dir, len, whole, skip_comments, | |
| 64 | --- 4535,4541 ---- | |
| 65 | #if defined(FEAT_FIND_ID) || defined(PROTO) | |
| 66 | /* | |
| 67 | * Find identifiers or defines in included files. | |
| 68 | ! * If p_ic && (compl_cont_status & CONT_SOL) then ptr must be in lowercase. | |
| 69 | */ | |
| 70 | void | |
| 71 | find_pattern_in_path(ptr, dir, len, whole, skip_comments, | |
| 72 | *** ../vim-7.3.134/src/version.c 2011-02-25 17:10:22.000000000 +0100 | |
| 73 | --- src/version.c 2011-02-25 18:35:30.000000000 +0100 | |
| 74 | *************** | |
| 75 | *** 716,717 **** | |
| 76 | --- 716,719 ---- | |
| 77 | { /* Add new patch number below this line */ | |
| 78 | + /**/ | |
| 79 | + 135, | |
| 80 | /**/ | |
| 81 | ||
| 82 | -- | |
| 83 | A real patriot is the fellow who gets a parking ticket and rejoices | |
| 84 | that the system works. | |
| 85 | ||
| 86 | ||
| 87 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 88 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 89 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 90 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |