diff options
| author | vimboss <devnull@localhost> | 2009-02-21 20:11:41 +0000 |
|---|---|---|
| committer | vimboss <devnull@localhost> | 2009-02-21 20:11:41 +0000 |
| commit | 1f2f545014aea2817674a63799914476b2829eb2 (patch) | |
| tree | 9262ef3417b2bab61f4d9895884af008408d8817 | |
| parent | 2b4908dd7581169b401cb6ec7de34de6458ac534 (diff) | |
| download | vim-1f2f545014aea2817674a63799914476b2829eb2.tar.gz | |
| -rw-r--r-- | src/screen.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/screen.c b/src/screen.c index 684c3942..f395bd0f 100644 --- a/src/screen.c +++ b/src/screen.c @@ -2596,6 +2596,7 @@ win_line(wp, lnum, startrow, endrow, nochange) int noinvcur = FALSE; /* don't invert the cursor */ #ifdef FEAT_VISUAL pos_T *top, *bot; + int lnum_in_visual_area = FALSE; #endif pos_T pos; long v; @@ -2792,9 +2793,10 @@ win_line(wp, lnum, startrow, endrow, nochange) top = &VIsual; bot = &curwin->w_cursor; } + lnum_in_visual_area = (lnum >= top->lnum && lnum <= bot->lnum); if (VIsual_mode == Ctrl_V) /* block mode */ { - if (lnum >= top->lnum && lnum <= bot->lnum) + if (lnum_in_visual_area) { fromcol = wp->w_old_cursor_fcol; tocol = wp->w_old_cursor_lcol; @@ -4557,7 +4559,8 @@ win_line(wp, lnum, startrow, endrow, nochange) * highlight the cursor position itself. */ if (wp->w_p_cuc && vcol == (long)wp->w_virtcol && lnum != wp->w_cursor.lnum - && draw_state == WL_LINE) + && draw_state == WL_LINE + && !lnum_in_visual_area) { vcol_save_attr = char_attr; char_attr = hl_combine_attr(char_attr, hl_attr(HLF_CUC)); diff --git a/src/version.c b/src/version.c index 7b13cecf..f724afd5 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 111, +/**/ 110, /**/ 109, |