projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| bab0032d AG |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.151 | |
| 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.151 (after 7.3.074) | |
| 11 | Problem: When "unnamedplus" is in 'clipboard' the selection is sometimes | |
| 12 | also copied to the star register. | |
| 13 | Solution: Avoid copy to the star register when undesired. (James Vega) | |
| 14 | Files: src/ops.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.3.150/src/ops.c 2010-12-08 14:23:08.000000000 +0100 | |
| 18 | --- src/ops.c 2011-04-01 16:23:10.000000000 +0200 | |
| 19 | *************** | |
| 20 | *** 3148,3157 **** | |
| 21 | /* Copy the text from register 0 to the clipboard register. */ | |
| 22 | copy_yank_reg(&(y_regs[PLUS_REGISTER])); | |
| 23 | ||
| 24 | - /* No need to copy to * register upon 'unnamed' now - see below */ | |
| 25 | clip_own_selection(&clip_plus); | |
| 26 | clip_gen_set_selection(&clip_plus); | |
| 27 | ! if (!clip_isautosel() && !did_star) | |
| 28 | { | |
| 29 | copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
| 30 | clip_own_selection(&clip_star); | |
| 31 | --- 3148,3156 ---- | |
| 32 | /* Copy the text from register 0 to the clipboard register. */ | |
| 33 | copy_yank_reg(&(y_regs[PLUS_REGISTER])); | |
| 34 | ||
| 35 | clip_own_selection(&clip_plus); | |
| 36 | clip_gen_set_selection(&clip_plus); | |
| 37 | ! if (!clip_isautosel() && !did_star && curr == &(y_regs[PLUS_REGISTER])) | |
| 38 | { | |
| 39 | copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
| 40 | clip_own_selection(&clip_star); | |
| 41 | *** ../vim-7.3.150/src/version.c 2011-04-01 16:07:41.000000000 +0200 | |
| 42 | --- src/version.c 2011-04-01 16:25:40.000000000 +0200 | |
| 43 | *************** | |
| 44 | *** 716,717 **** | |
| 45 | --- 716,719 ---- | |
| 46 | { /* Add new patch number below this line */ | |
| 47 | + /**/ | |
| 48 | + 151, | |
| 49 | /**/ | |
| 50 | ||
| 51 | -- | |
| 52 | BLACK KNIGHT: I'm invincible! | |
| 53 | ARTHUR: You're a looney. | |
| 54 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
| 55 | ||
| 56 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 57 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 58 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 59 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |