aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

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

Browse Source 
highlighting.
This commit is contained in:
Bram Moolenaar
2010-07-19 20:13:22 +02:00
parent c400cb9ca7
commit a7781e0516
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/doc/options.txt
View File

@@ -1724,10 +1724,10 @@ A jump table for the options with a short description can be found at |Q_op|.
2 Concealed text is completely hidden unless it has a 2 Concealed text is completely hidden unless it has a
custom replacement character defined (see custom replacement character defined (see
|:syn-cchar|. |:syn-cchar|.
3 Concealed text is completely hidden. Note: when 3 Concealed text is completely hidden.
moving the cursor after concealed items the position
will be wrong.
Note: in the cursor line concealed text is not hidden, so that you can
edit and copy the text.
*'confirm'* *'cf'* *'noconfirm'* *'nocf'* *'confirm'* *'cf'* *'noconfirm'* *'nocf'*
'confirm' 'cf' boolean (default off) 'confirm' 'cf' boolean (default off)

5
src/screen.c
View File

@@ -4378,11 +4378,8 @@ win_line(wp, lnum, startrow, endrow, nochange)
#ifdef FEAT_CONCEAL #ifdef FEAT_CONCEAL
if ( wp->w_p_conc > 0 if ( wp->w_p_conc > 0
&& !area_highlighting && (lnum != wp->w_cursor.lnum || curwin != wp)
&& (lnum != wp->w_cursor.lnum
|| curwin != wp || wp->w_buffer->b_p_ma == FALSE)
&& (syntax_flags & HL_CONCEAL) != 0) && (syntax_flags & HL_CONCEAL) != 0)
{ {
char_attr = conceal_attr; char_attr = conceal_attr;
if (first_conceal if (first_conceal