projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 9512a71a AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.111 | |
| 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.2.111 | |
| 11 | Problem: When using Visual block mode with 'cursorcolumn' it's unclear what | |
| 12 | is selected. | |
| 13 | Solution: Don't use 'cursorcolumn' highlighting inside the Visual selection. | |
| 14 | (idea by Dominique Pelle) | |
| 15 | Files: src/screen.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-7.2.110/src/screen.c Wed Oct 1 21:09:02 2008 | |
| 19 | --- src/screen.c Sat Feb 21 21:04:19 2009 | |
| 20 | *************** | |
| 21 | *** 2596,2601 **** | |
| 22 | --- 2596,2602 ---- | |
| 23 | int noinvcur = FALSE; /* don't invert the cursor */ | |
| 24 | #ifdef FEAT_VISUAL | |
| 25 | pos_T *top, *bot; | |
| 26 | + int lnum_in_visual_area = FALSE; | |
| 27 | #endif | |
| 28 | pos_T pos; | |
| 29 | long v; | |
| 30 | *************** | |
| 31 | *** 2792,2800 **** | |
| 32 | top = &VIsual; | |
| 33 | bot = &curwin->w_cursor; | |
| 34 | } | |
| 35 | if (VIsual_mode == Ctrl_V) /* block mode */ | |
| 36 | { | |
| 37 | ! if (lnum >= top->lnum && lnum <= bot->lnum) | |
| 38 | { | |
| 39 | fromcol = wp->w_old_cursor_fcol; | |
| 40 | tocol = wp->w_old_cursor_lcol; | |
| 41 | --- 2793,2802 ---- | |
| 42 | top = &VIsual; | |
| 43 | bot = &curwin->w_cursor; | |
| 44 | } | |
| 45 | + lnum_in_visual_area = (lnum >= top->lnum && lnum <= bot->lnum); | |
| 46 | if (VIsual_mode == Ctrl_V) /* block mode */ | |
| 47 | { | |
| 48 | ! if (lnum_in_visual_area) | |
| 49 | { | |
| 50 | fromcol = wp->w_old_cursor_fcol; | |
| 51 | tocol = wp->w_old_cursor_lcol; | |
| 52 | *************** | |
| 53 | *** 4557,4563 **** | |
| 54 | * highlight the cursor position itself. */ | |
| 55 | if (wp->w_p_cuc && vcol == (long)wp->w_virtcol | |
| 56 | && lnum != wp->w_cursor.lnum | |
| 57 | ! && draw_state == WL_LINE) | |
| 58 | { | |
| 59 | vcol_save_attr = char_attr; | |
| 60 | char_attr = hl_combine_attr(char_attr, hl_attr(HLF_CUC)); | |
| 61 | --- 4560,4567 ---- | |
| 62 | * highlight the cursor position itself. */ | |
| 63 | if (wp->w_p_cuc && vcol == (long)wp->w_virtcol | |
| 64 | && lnum != wp->w_cursor.lnum | |
| 65 | ! && draw_state == WL_LINE | |
| 66 | ! && !lnum_in_visual_area) | |
| 67 | { | |
| 68 | vcol_save_attr = char_attr; | |
| 69 | char_attr = hl_combine_attr(char_attr, hl_attr(HLF_CUC)); | |
| 70 | *** ../vim-7.2.110/src/version.c Sat Feb 21 20:36:30 2009 | |
| 71 | --- src/version.c Sat Feb 21 21:08:14 2009 | |
| 72 | *************** | |
| 73 | *** 678,679 **** | |
| 74 | --- 678,681 ---- | |
| 75 | { /* Add new patch number below this line */ | |
| 76 | + /**/ | |
| 77 | + 111, | |
| 78 | /**/ | |
| 79 | ||
| 80 | -- | |
| 81 | Contrary to popular belief, Unix is user friendly. | |
| 82 | It just happens to be selective about who it makes friends with. | |
| 83 | -- Dave Parnas | |
| 84 | ||
| 85 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 86 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 87 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 88 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |