projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| d2415672 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.1.192 | |
| 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.192 | |
| 11 | Problem: With Visual block selection, "s" and typing something, CTRL-C | |
| 12 | doesn't stop Vim from repeating the replacement in other lines, | |
| 13 | like happens for "I". | |
| 14 | Solution: Check for "got_int" to be set. | |
| 15 | Files: src/ops.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-7.1.191/src/ops.c Sat Dec 1 21:12:23 2007 | |
| 19 | --- src/ops.c Thu Jan 3 16:26:37 2008 | |
| 20 | *************** | |
| 21 | *** 2468,2476 **** | |
| 22 | ||
| 23 | edit(NUL, FALSE, (linenr_T)count1); | |
| 24 | ||
| 25 | ! /* if user has moved off this line, we don't know what to do, so do | |
| 26 | ! * nothing */ | |
| 27 | ! if (curwin->w_cursor.lnum != oap->start.lnum) | |
| 28 | return; | |
| 29 | ||
| 30 | if (oap->block_mode) | |
| 31 | --- 2468,2477 ---- | |
| 32 | ||
| 33 | edit(NUL, FALSE, (linenr_T)count1); | |
| 34 | ||
| 35 | ! /* If user has moved off this line, we don't know what to do, so do | |
| 36 | ! * nothing. | |
| 37 | ! * Also don't repeat the insert when Insert mode ended with CTRL-C. */ | |
| 38 | ! if (curwin->w_cursor.lnum != oap->start.lnum || got_int) | |
| 39 | return; | |
| 40 | ||
| 41 | if (oap->block_mode) | |
| 42 | *************** | |
| 43 | *** 2601,2608 **** | |
| 44 | /* | |
| 45 | * In Visual block mode, handle copying the new text to all lines of the | |
| 46 | * block. | |
| 47 | */ | |
| 48 | ! if (oap->block_mode && oap->start.lnum != oap->end.lnum) | |
| 49 | { | |
| 50 | /* Auto-indenting may have changed the indent. If the cursor was past | |
| 51 | * the indent, exclude that indent change from the inserted text. */ | |
| 52 | --- 2602,2610 ---- | |
| 53 | /* | |
| 54 | * In Visual block mode, handle copying the new text to all lines of the | |
| 55 | * block. | |
| 56 | + * Don't repeat the insert when Insert mode ended with CTRL-C. | |
| 57 | */ | |
| 58 | ! if (oap->block_mode && oap->start.lnum != oap->end.lnum && !got_int) | |
| 59 | { | |
| 60 | /* Auto-indenting may have changed the indent. If the cursor was past | |
| 61 | * the indent, exclude that indent change from the inserted text. */ | |
| 62 | *** ../vim-7.1.191/src/version.c Thu Jan 3 16:14:25 2008 | |
| 63 | --- src/version.c Thu Jan 3 16:30:07 2008 | |
| 64 | *************** | |
| 65 | *** 668,669 **** | |
| 66 | --- 668,671 ---- | |
| 67 | { /* Add new patch number below this line */ | |
| 68 | + /**/ | |
| 69 | + 192, | |
| 70 | /**/ | |
| 71 | ||
| 72 | -- | |
| 73 | "A mouse can be just as dangerous as a bullet or a bomb." | |
| 74 | (US Representative Lamar Smith, R-Texas) | |
| 75 | ||
| 76 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 77 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 78 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 79 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |