projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| d36b537e AF |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.3.004 | |
| 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 6.3.004 | |
| 11 | Problem: When searching for a long string (140 chars in a 80 column | |
| 12 | terminal) get three hit-enter prompts. (Benji Fisher) | |
| 13 | Solution: Avoid the hit-enter prompt when giving the message for wrapping | |
| 14 | around the end of the buffer. Don't give that message again when | |
| 15 | the string was not found. | |
| 16 | Files: src/message.c, src/search.c | |
| 17 | ||
| 18 | ||
| 19 | *** ../vim-6.3.003/src/message.c Fri Jun 11 20:20:22 2004 | |
| 20 | --- src/message.c Sun Jun 13 12:15:03 2004 | |
| 21 | *************** | |
| 22 | *** 2572,2577 **** | |
| 23 | --- 2572,2579 ---- | |
| 24 | if (msg_silent != 0) | |
| 25 | return; | |
| 26 | ||
| 27 | + /* Don't want a hit-enter prompt here. */ | |
| 28 | + ++no_wait_return; | |
| 29 | #ifdef FEAT_EVAL | |
| 30 | set_vim_var_string(VV_WARNINGMSG, message, -1); | |
| 31 | #endif | |
| 32 | *************** | |
| 33 | *** 2590,2595 **** | |
| 34 | --- 2592,2598 ---- | |
| 35 | msg_nowait = TRUE; /* don't wait for this message */ | |
| 36 | msg_col = 0; | |
| 37 | #endif | |
| 38 | + --no_wait_return; | |
| 39 | } | |
| 40 | ||
| 41 | /* | |
| 42 | *** ../vim-6.3.003/src/search.c Wed Jun 9 14:56:27 2004 | |
| 43 | --- src/search.c Sun Jun 13 12:27:03 2004 | |
| 44 | *************** | |
| 45 | *** 808,817 **** | |
| 46 | at_first_line = FALSE; | |
| 47 | ||
| 48 | /* | |
| 49 | ! * stop the search if wrapscan isn't set, after an interrupt and | |
| 50 | ! * after a match | |
| 51 | */ | |
| 52 | ! if (!p_ws || got_int || called_emsg || break_loop || found) | |
| 53 | break; | |
| 54 | ||
| 55 | /* | |
| 56 | --- 808,817 ---- | |
| 57 | at_first_line = FALSE; | |
| 58 | ||
| 59 | /* | |
| 60 | ! * Stop the search if wrapscan isn't set, after an interrupt, | |
| 61 | ! * after a match and after looping twice. | |
| 62 | */ | |
| 63 | ! if (!p_ws || got_int || called_emsg || break_loop || found || loop) | |
| 64 | break; | |
| 65 | ||
| 66 | /* | |
| 67 | *** ../vim-6.3.003/src/version.c Fri Jun 11 20:20:22 2004 | |
| 68 | --- src/version.c Sun Jun 13 12:18:27 2004 | |
| 69 | *************** | |
| 70 | *** 643,644 **** | |
| 71 | --- 643,646 ---- | |
| 72 | { /* Add new patch number below this line */ | |
| 73 | + /**/ | |
| 74 | + 4, | |
| 75 | /**/ | |
| 76 | ||
| 77 | -- | |
| 78 | hundred-and-one symptoms of being an internet addict: | |
| 79 | 102. When filling out your driver's license application, you give | |
| 80 | your IP address. | |
| 81 | ||
| 82 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 83 | /// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 84 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 85 | \\\ Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html /// |