aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-04 21:33:48 -04:00
Code

updated for version 7.2-148

Browse Source
This commit is contained in:
Bram Moolenaar 2009-03-18 18:09:03 +00:00
parent 1b636fa0e8
commit f3205d1ee7
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/screen.c
View File

@ -2889,8 +2889,9 @@ win_line(wp, lnum, startrow, endrow, nochange)
} }
else else
tocol = MAXCOL; tocol = MAXCOL;
if (fromcol == tocol) /* do at least one character */ /* do at least one character; happens when past end of line */
tocol = fromcol + 1; /* happens when past end of line */ if (fromcol == tocol)
tocol = fromcol + 1;
area_highlighting = TRUE; area_highlighting = TRUE;
attr = hl_attr(HLF_I); attr = hl_attr(HLF_I);
} }
@ -4118,6 +4119,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
# endif # endif
(col < W_WIDTH(wp))) (col < W_WIDTH(wp)))
&& !(noinvcur && !(noinvcur
&& lnum == wp->w_cursor.lnum
&& (colnr_T)vcol == wp->w_virtcol))) && (colnr_T)vcol == wp->w_virtcol)))
&& lcs_eol_one >= 0) && 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 * preedit_changed and commit. Thus Vim can't set "im_is_active", use
* im_is_preediting() here. */ * im_is_preediting() here. */
if (xic != NULL if (xic != NULL
&& lnum == curwin->w_cursor.lnum && lnum == wp->w_cursor.lnum
&& (State & INSERT) && (State & INSERT)
&& !p_imdisable && !p_imdisable
&& im_is_preediting() && im_is_preediting()
@ -4268,7 +4270,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
colnr_T tcol; colnr_T tcol;
if (preedit_end_col == MAXCOL) if (preedit_end_col == MAXCOL)
getvcol(curwin, &(curwin->w_cursor), &tcol, NULL, NULL); getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL);
else else
tcol = preedit_end_col; tcol = preedit_end_col;
if ((long)preedit_start_col <= vcol && vcol < (long)tcol) if ((long)preedit_start_col <= vcol && vcol < (long)tcol)
@ -4365,7 +4367,13 @@ win_line(wp, lnum, startrow, endrow, nochange)
} }
#endif #endif
if (lcs_eol == lcs_eol_one 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 #ifdef FEAT_SEARCH_EXTRA
/* highlight 'hlsearch' match at end of line */ /* highlight 'hlsearch' match at end of line */
|| (prevcol_hl_flag == TRUE || (prevcol_hl_flag == TRUE
@ -4459,7 +4467,8 @@ win_line(wp, lnum, startrow, endrow, nochange)
if (c == NUL) if (c == NUL)
{ {
#ifdef FEAT_SYN_HL #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 */ /* highlight last char after line */
--col; --col;

2
src/version.c
View File

@ -676,6 +676,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
148,
/**/ /**/
147, 147,
/**/ /**/