Mercurial > vim

comparison src/screen.c @ 2349:586a459f3980 vim73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Never hide text for conceal in cursor line. Do hide when there is highlighting.
author Bram Moolenaar <bram@vim.org>
date Mon, 19 Jul 2010 20:13:22 +0200
parents 8878a9f8db87
children eb1f2554cac5
comparison
equal deleted inserted replaced
2348:8878a9f8db87 2349:586a459f3980
4375 } 4375 }
4376 #endif 4376 #endif
4377 } 4377 }
4378 4378
4379 #ifdef FEAT_CONCEAL 4379 #ifdef FEAT_CONCEAL
4380 if ( wp->w_p_conc > 0 4380 if ( wp->w_p_conc > 0
4381 && !area_highlighting 4381 && (lnum != wp->w_cursor.lnum || curwin != wp)
4382 && (lnum != wp->w_cursor.lnum 4382 && (syntax_flags & HL_CONCEAL) != 0)
4383 || curwin != wp || wp->w_buffer->b_p_ma == FALSE)
4384 && (syntax_flags & HL_CONCEAL) != 0)
4385
4386 { 4383 {
4387 char_attr = conceal_attr; 4384 char_attr = conceal_attr;
4388 if (first_conceal 4385 if (first_conceal
4389 && (syn_get_sub_char() != NUL || wp->w_p_conc == 1)) 4386 && (syn_get_sub_char() != NUL || wp->w_p_conc == 1))
4390 { 4387 {