Mercurial > vim
changeset 2349:586a459f3980 vim73
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 | 06feaf4fe36a |
| files | runtime/doc/options.txt src/screen.c |
| diffstat | 2 files changed, 7 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1724,10 +1724,10 @@ A jump table for the options with a shor 2 Concealed text is completely hidden unless it has a custom replacement character defined (see |:syn-cchar|. - 3 Concealed text is completely hidden. Note: when - moving the cursor after concealed items the position - will be wrong. - + 3 Concealed text is completely hidden. + + 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' boolean (default off)
--- a/src/screen.c +++ b/src/screen.c @@ -4377,12 +4377,9 @@ win_line(wp, lnum, startrow, endrow, noc } #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