thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

updated for version 7.0-036

Browse Source
This commit is contained in:
Bram Moolenaar 2006-07-11 20:36:45 +00:00
parent a260a9793b
commit 6c60ea21c2
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/screen.c
View File

@ -2612,7 +2612,8 @@ win_line(wp, lnum, startrow, endrow, nochange)
#ifdef FEAT_LINEBREAK #ifdef FEAT_LINEBREAK
int need_showbreak = FALSE; int need_showbreak = FALSE;
#endif #endif
#if defined(FEAT_SIGNS) || (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS)) #if defined(FEAT_SIGNS) || (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS)) \
|| defined(FEAT_SYN_HL) || defined(FEAT_DIFF)
# define LINE_ATTR # define LINE_ATTR
int line_attr = 0; /* atrribute for the whole line */ int line_attr = 0; /* atrribute for the whole line */
#endif #endif
@ -2626,7 +2627,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
int prev_c = 0; /* previous Arabic character */ int prev_c = 0; /* previous Arabic character */
int prev_c1 = 0; /* first composing char for prev_c */ int prev_c1 = 0; /* first composing char for prev_c */
#endif #endif
#if defined(FEAT_DIFF) || defined(LINE_ATTR) #if defined(LINE_ATTR)
int did_line_attr = 0; int did_line_attr = 0;
#endif #endif
@ -4116,17 +4117,12 @@ win_line(wp, lnum, startrow, endrow, nochange)
--ptr; /* put it back at the NUL */ --ptr; /* put it back at the NUL */
} }
#endif #endif
#if defined(FEAT_DIFF) || defined(LINE_ATTR) #if defined(LINE_ATTR)
else if (( else if ((
# ifdef FEAT_DIFF # ifdef FEAT_DIFF
diff_hlf != (hlf_T)0 diff_hlf != (hlf_T)0 ||
# ifdef LINE_ATTR
||
# endif # endif
# endif
# ifdef LINE_ATTR
line_attr != 0 line_attr != 0
# endif
) && ( ) && (
# ifdef FEAT_RIGHTLEFT # ifdef FEAT_RIGHTLEFT
wp->w_p_rl ? (col >= 0) : wp->w_p_rl ? (col >= 0) :
@ -4237,7 +4233,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
* At end of the text line or just after the last character. * At end of the text line or just after the last character.
*/ */
if (c == NUL if (c == NUL
#if defined(FEAT_DIFF) || defined(LINE_ATTR) #if defined(LINE_ATTR)
|| did_line_attr == 1 || did_line_attr == 1
#endif #endif
) )
@ -4258,7 +4254,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
|| prevcol == (long)match_hl[0].startcol || prevcol == (long)match_hl[0].startcol
|| prevcol == (long)match_hl[1].startcol || prevcol == (long)match_hl[1].startcol
|| prevcol == (long)match_hl[2].startcol) || prevcol == (long)match_hl[2].startcol)
# if defined(FEAT_DIFF) || defined(LINE_ATTR) # if defined(LINE_ATTR)
&& did_line_attr <= 1 && did_line_attr <= 1
# endif # endif
) )

2
src/version.c
View File

@ -666,6 +666,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 */
/**/
36,
/**/ /**/
35, 35,
/**/ /**/