diff options
| author | Bram Moolenaar <Bram@vim.org> | 2009-03-18 18:09:03 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2009-03-18 18:09:03 +0000 |
| commit | f3205d1ee7b3cc7b054680bfa4e7e14a9a5b477e (patch) | |
| tree | bc97de448ab7bf4856cc85e0aeef180a0fcb371b | |
| parent | 1b636fa0e8206aa5688b5b4f035b38a560dce2f0 (diff) | |
| download | vim-git-7.2.148.tar.gz | |
updated for version 7.2-148v7.2.148
| -rw-r--r-- | src/screen.c | 21 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 17 insertions, 6 deletions
diff --git a/src/screen.c b/src/screen.c index 0c60bc0ac..6455f112d 100644 --- a/src/screen.c +++ b/src/screen.c @@ -2889,8 +2889,9 @@ win_line(wp, lnum, startrow, endrow, nochange) } else tocol = MAXCOL; - if (fromcol == tocol) /* do at least one character */ - tocol = fromcol + 1; /* happens when past end of line */ + /* do at least one character; happens when past end of line */ + if (fromcol == tocol) + tocol = fromcol + 1; area_highlighting = TRUE; attr = hl_attr(HLF_I); } @@ -4118,6 +4119,7 @@ win_line(wp, lnum, startrow, endrow, nochange) # endif (col < W_WIDTH(wp))) && !(noinvcur + && lnum == wp->w_cursor.lnum && (colnr_T)vcol == wp->w_virtcol))) && lcs_eol_one >= 0) { @@ -4259,7 +4261,7 @@ win_line(wp, lnum, startrow, endrow, nochange) * preedit_changed and commit. Thus Vim can't set "im_is_active", use * im_is_preediting() here. */ if (xic != NULL - && lnum == curwin->w_cursor.lnum + && lnum == wp->w_cursor.lnum && (State & INSERT) && !p_imdisable && im_is_preediting() @@ -4268,7 +4270,7 @@ win_line(wp, lnum, startrow, endrow, nochange) colnr_T tcol; if (preedit_end_col == MAXCOL) - getvcol(curwin, &(curwin->w_cursor), &tcol, NULL, NULL); + getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); else tcol = preedit_end_col; if ((long)preedit_start_col <= vcol && vcol < (long)tcol) @@ -4365,7 +4367,13 @@ win_line(wp, lnum, startrow, endrow, nochange) } #endif if (lcs_eol == lcs_eol_one - && ((area_attr != 0 && vcol == fromcol && c == NUL) + && ((area_attr != 0 && vcol == fromcol +#ifdef FEAT_VISUAL + && (VIsual_mode != Ctrl_V + || lnum == VIsual.lnum + || lnum == curwin->w_cursor.lnum) +#endif + && c == NUL) #ifdef FEAT_SEARCH_EXTRA /* highlight 'hlsearch' match at end of line */ || (prevcol_hl_flag == TRUE @@ -4459,7 +4467,8 @@ win_line(wp, lnum, startrow, endrow, nochange) if (c == NUL) { #ifdef FEAT_SYN_HL - if (eol_hl_off > 0 && vcol - eol_hl_off == (long)wp->w_virtcol) + if (eol_hl_off > 0 && vcol - eol_hl_off == (long)wp->w_virtcol + && lnum == wp->w_cursor.lnum) { /* highlight last char after line */ --col; diff --git a/src/version.c b/src/version.c index e37682237..756ed263a 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 */ /**/ + 148, +/**/ 147, /**/ 146, |