projects / people / arne_f / ipfire-3.x.git / blame
| Commit | Line | Data |
|---|---|---|
| c6060300 MT |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.529 | |
| 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.529 | |
| 11 | Problem: Using a count before "v" and "V" does not work (Kikyous) | |
| 12 | Solution: Make the count select that many characters or lines. (Christian | |
| 13 | Brabandt) | |
| 14 | Files: src/normal.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.3.528/src/normal.c 2012-05-25 11:04:34.000000000 +0200 | |
| 18 | --- src/normal.c 2012-05-25 13:12:06.000000000 +0200 | |
| 19 | *************** | |
| 20 | *** 7660,7672 **** | |
| 21 | else /* start Visual mode */ | |
| 22 | { | |
| 23 | check_visual_highlight(); | |
| 24 | ! if (cap->count0) /* use previously selected part */ | |
| 25 | { | |
| 26 | ! if (resel_VIsual_mode == NUL) /* there is none */ | |
| 27 | ! { | |
| 28 | ! beep_flush(); | |
| 29 | ! return; | |
| 30 | ! } | |
| 31 | VIsual = curwin->w_cursor; | |
| 32 | ||
| 33 | VIsual_active = TRUE; | |
| 34 | --- 7660,7668 ---- | |
| 35 | else /* start Visual mode */ | |
| 36 | { | |
| 37 | check_visual_highlight(); | |
| 38 | ! if (cap->count0 > 0 && resel_VIsual_mode != NUL) | |
| 39 | { | |
| 40 | ! /* use previously selected part */ | |
| 41 | VIsual = curwin->w_cursor; | |
| 42 | ||
| 43 | VIsual_active = TRUE; | |
| 44 | *************** | |
| 45 | *** 7725,7730 **** | |
| 46 | --- 7721,7736 ---- | |
| 47 | /* start Select mode when 'selectmode' contains "cmd" */ | |
| 48 | may_start_select('c'); | |
| 49 | n_start_visual_mode(cap->cmdchar); | |
| 50 | + if (VIsual_mode != 'V' && *p_sel == 'e') | |
| 51 | + ++cap->count1; /* include one more char */ | |
| 52 | + if (cap->count0 > 0 && --cap->count1 > 0) | |
| 53 | + { | |
| 54 | + /* With a count select that many characters or lines. */ | |
| 55 | + if (VIsual_mode == 'v' || VIsual_mode == Ctrl_V) | |
| 56 | + nv_right(cap); | |
| 57 | + else if (VIsual_mode == 'V') | |
| 58 | + nv_down(cap); | |
| 59 | + } | |
| 60 | } | |
| 61 | } | |
| 62 | } | |
| 63 | *** ../vim-7.3.528/src/version.c 2012-05-25 12:38:57.000000000 +0200 | |
| 64 | --- src/version.c 2012-05-25 12:59:58.000000000 +0200 | |
| 65 | *************** | |
| 66 | *** 716,717 **** | |
| 67 | --- 716,719 ---- | |
| 68 | { /* Add new patch number below this line */ | |
| 69 | + /**/ | |
| 70 | + 529, | |
| 71 | /**/ | |
| 72 | ||
| 73 | -- | |
| 74 | Normal people believe that if it ain't broke, don't fix it. Engineers believe | |
| 75 | that if it ain't broke, it doesn't have enough features yet. | |
| 76 | (Scott Adams - The Dilbert principle) | |
| 77 | ||
| 78 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 79 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 80 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 81 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |