commit a7781e0516ce0b95afc21ad65bf47571922c022a
author Bram Moolenaar <Bram@vim.org> Mon Jul 19 20:13:22 2010 +0200
committer Bram Moolenaar <Bram@vim.org> Mon Jul 19 20:13:22 2010 +0200
tree 689c4498446bb520cd21acaa9b83c097ab69b3fe
parent c400cb9ca7dbd88a6c0ae678c7e04e54311d552d

Never hide text for conceal in cursor line.  Do hide when there is
highlighting.

src/screen.c

diff --git a/src/screen.c b/src/screen.c
index 7d6985a..de405e1 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4377,12 +4377,9 @@
 	    }
 
 #ifdef FEAT_CONCEAL
-	    if (    wp->w_p_conc > 0
-		    && !area_highlighting
-		    && (lnum != wp->w_cursor.lnum
-			|| curwin != wp || wp->w_buffer->b_p_ma == FALSE)
-		    && (syntax_flags & HL_CONCEAL) != 0)
-
+	    if (   wp->w_p_conc > 0
+		&& (lnum != wp->w_cursor.lnum || curwin != wp)
+		&& (syntax_flags & HL_CONCEAL) != 0)
 	    {
 		char_attr = conceal_attr;
 		if (first_conceal