diff options
| author | Bram Moolenaar <Bram@vim.org> | 2009-11-03 16:36:44 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2009-11-03 16:36:44 +0000 |
| commit | bb6a705451c0a429dc8dba05787880fa2df0288d (patch) | |
| tree | 12255a47f08eed001c4aaf5da276c18817cea4e1 /src | |
| parent | 362f3569aeb4806860e50ef5ea633168496e0524 (diff) | |
| download | vim-git-bb6a705451c0a429dc8dba05787880fa2df0288d.tar.gz | |
updated for version 7.2-281v7.2.281
Diffstat (limited to 'src')
| -rw-r--r-- | src/screen.c | 30 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 28 insertions, 4 deletions
diff --git a/src/screen.c b/src/screen.c index 7570b6f11..b7107b625 100644 --- a/src/screen.c +++ b/src/screen.c @@ -3008,11 +3008,33 @@ win_line(wp, lnum, startrow, endrow, nochange) mb_ptr_adv(ptr); } -#ifdef FEAT_VIRTUALEDIT - /* When 'virtualedit' is set the end of the line may be before the - * start of the displayed part. */ - if (vcol < v && *ptr == NUL && virtual_active()) +#if defined(FEAT_SYN_HL) || defined(FEAT_VIRTUALEDIT) || defined(FEAT_VISUAL) + /* When: + * - 'cuc' is set, or + * - 'virtualedit' is set, or + * - the visual mode is active, + * the end of the line may be before the start of the displayed part. + */ + if (vcol < v && ( +# ifdef FEAT_SYN_HL + wp->w_p_cuc +# if defined(FEAT_VIRTUALEDIT) || defined(FEAT_VISUAL) + || +# endif +# endif +# ifdef FEAT_VIRTUALEDIT + virtual_active() +# ifdef FEAT_VISUAL + || +# endif +# endif +# ifdef FEAT_VISUAL + (VIsual_active && wp->w_buffer == curwin->w_buffer) +# endif + )) + { vcol = v; + } #endif /* Handle a character that's not completely on the screen: Put ptr at diff --git a/src/version.c b/src/version.c index a4214fc96..e6b9056a8 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 */ /**/ + 281, +/**/ 280, /**/ 279, |