projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 5a088057 KK |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.649 | |
| 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.649 | |
| 11 | Problem: When 'clipboard' is set to "unnamed" small deletes end up in the | |
| 12 | numbered registers. (Ingo Karkat) | |
| 13 | Solution: Use the original register name to decide whether to put a delete | |
| 14 | in a numbered register. (Christian Brabandt) | |
| 15 | Files: src/ops.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-7.3.648/src/ops.c 2012-08-08 18:01:00.000000000 +0200 | |
| 19 | --- src/ops.c 2012-09-05 14:13:32.000000000 +0200 | |
| 20 | *************** | |
| 21 | *** 1623,1628 **** | |
| 22 | --- 1623,1629 ---- | |
| 23 | #endif | |
| 24 | linenr_T old_lcount = curbuf->b_ml.ml_line_count; | |
| 25 | int did_yank = FALSE; | |
| 26 | + int orig_regname = oap->regname; | |
| 27 | ||
| 28 | if (curbuf->b_ml.ml_flags & ML_EMPTY) /* nothing to do */ | |
| 29 | return OK; | |
| 30 | *************** | |
| 31 | *** 1715,1722 **** | |
| 32 | /* | |
| 33 | * Put deleted text into register 1 and shift number registers if the | |
| 34 | * delete contains a line break, or when a regname has been specified. | |
| 35 | */ | |
| 36 | ! if (oap->regname != 0 || oap->motion_type == MLINE | |
| 37 | || oap->line_count > 1 || oap->use_reg_one) | |
| 38 | { | |
| 39 | y_current = &y_regs[9]; | |
| 40 | --- 1716,1725 ---- | |
| 41 | /* | |
| 42 | * Put deleted text into register 1 and shift number registers if the | |
| 43 | * delete contains a line break, or when a regname has been specified. | |
| 44 | + * Use the register name from before adjust_clip_reg() may have | |
| 45 | + * changed it. | |
| 46 | */ | |
| 47 | ! if (orig_regname != 0 || oap->motion_type == MLINE | |
| 48 | || oap->line_count > 1 || oap->use_reg_one) | |
| 49 | { | |
| 50 | y_current = &y_regs[9]; | |
| 51 | *** ../vim-7.3.648/src/version.c 2012-09-05 13:30:22.000000000 +0200 | |
| 52 | --- src/version.c 2012-09-05 14:17:55.000000000 +0200 | |
| 53 | *************** | |
| 54 | *** 721,722 **** | |
| 55 | --- 721,724 ---- | |
| 56 | { /* Add new patch number below this line */ | |
| 57 | + /**/ | |
| 58 | + 649, | |
| 59 | /**/ | |
| 60 | ||
| 61 | -- | |
| 62 | 'I generally avoid temptation unless I can't resist it." | |
| 63 | -- Mae West | |
| 64 | ||
| 65 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 66 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 67 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 68 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |