diff src/screen.c @ 2392:0371401d9d33 vim73

Give each syntax item a sequence number, so that we know when it starts and can show the 'cchar' for each of them.
author Bram Moolenaar <bram@vim.org>
date Sat, 24 Jul 2010 17:29:03 +0200
parents 3a5ededa240a
children 210a5605e126
line wrap: on
line diff
--- a/src/screen.c
+++ b/src/screen.c
@@ -2816,7 +2816,7 @@ win_line(wp, lnum, startrow, endrow, noc
 
 #ifdef FEAT_CONCEAL
     int		syntax_flags	= 0;
-    int		syntax_id	= 0;
+    int		syntax_seqnr	= 0;
     int		prev_syntax_id	= 0;
     int		conceal_attr	= hl_attr(HLF_CONCEAL);
     int		is_concealing	= FALSE;
@@ -4099,7 +4099,7 @@ win_line(wp, lnum, startrow, endrow, noc
 		    if (c == NUL)
 			syntax_flags = 0;
 		    else
-			syntax_flags = get_syntax_info(&syntax_id);
+			syntax_flags = get_syntax_info(&syntax_seqnr);
 # endif
 		}
 #endif
@@ -4430,7 +4430,7 @@ win_line(wp, lnum, startrow, endrow, noc
 		&& !lnum_in_visual_area)
 	    {
 		char_attr = conceal_attr;
-		if (prev_syntax_id != syntax_id
+		if (prev_syntax_id != syntax_seqnr
 			&& (syn_get_sub_char() != NUL || wp->w_p_cole == 1)
 			&& wp->w_p_cole != 3)
 		{
@@ -4443,7 +4443,7 @@ win_line(wp, lnum, startrow, endrow, noc
 		    else
 			c = ' ';
 
-		    prev_syntax_id = syntax_id;
+		    prev_syntax_id = syntax_seqnr;
 
 		    if (n_extra > 0)
 			vcol_off += n_extra;