diff options
| author | vimboss <devnull@localhost> | 2008-10-02 16:04:05 +0000 |
|---|---|---|
| committer | vimboss <devnull@localhost> | 2008-10-02 16:04:05 +0000 |
| commit | 3ff2c96cf95f9b5cdd98bd70de6d354e977d2d69 (patch) | |
| tree | b25ba3fd6d05770cfccb6c7b05d85a6411f25148 | |
| parent | e7be9a31c5062eea7573649003071b4e3d2f598c (diff) | |
| download | vim-3ff2c96cf95f9b5cdd98bd70de6d354e977d2d69.tar.gz | |
| -rw-r--r-- | src/screen.c | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/screen.c b/src/screen.c index 45ccf003..684c3942 100644 --- a/src/screen.c +++ b/src/screen.c @@ -2439,9 +2439,17 @@ fold_line(wp, fold_count, foldinfo, lnum, row) #ifdef FEAT_SYN_HL /* Show 'cursorcolumn' in the fold line. */ - if (wp->w_p_cuc && (int)wp->w_virtcol + txtcol < W_WIDTH(wp)) - ScreenAttrs[off + wp->w_virtcol + txtcol] = hl_combine_attr( - ScreenAttrs[off + wp->w_virtcol + txtcol], hl_attr(HLF_CUC)); + if (wp->w_p_cuc) + { + txtcol += wp->w_virtcol; + if (wp->w_p_wrap) + txtcol -= wp->w_skipcol; + else + txtcol -= wp->w_leftcol; + if (txtcol >= 0 && txtcol < W_WIDTH(wp)) + ScreenAttrs[off + txtcol] = hl_combine_attr( + ScreenAttrs[off + txtcol], hl_attr(HLF_CUC)); + } #endif SCREEN_LINE(row + W_WINROW(wp), W_WINCOL(wp), (int)W_WIDTH(wp), diff --git a/src/version.c b/src/version.c index c3c93477..0ed7da10 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 */ /**/ + 23, +/**/ 22, /**/ 21, |