summaryrefslogtreecommitdiff
path: root/src/screen.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-07-19 20:13:22 +0200
committerBram Moolenaar <Bram@vim.org>2010-07-19 20:13:22 +0200
commita7781e0516ce0b95afc21ad65bf47571922c022a (patch)
tree689c4498446bb520cd21acaa9b83c097ab69b3fe /src/screen.c
parentc400cb9ca7dbd88a6c0ae678c7e04e54311d552d (diff)
downloadvim-git-a7781e0516ce0b95afc21ad65bf47571922c022a.tar.gz
Never hide text for conceal in cursor line. Do hide when there is
highlighting.
Diffstat (limited to 'src/screen.c')
-rw-r--r--src/screen.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/screen.c b/src/screen.c
index 7d6985a8a..de405e14c 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4377,12 +4377,9 @@ win_line(wp, lnum, startrow, endrow, nochange)
}
#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