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

highlighting.

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index cbf0994137f83962971f8e51b23b334fad1fd07c..acfbf60240c56695dc9b164be7c35e26f2c52784 100644 (file)
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -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
                        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)

diff --git a/src/screen.c b/src/screen.c
index 7d6985a8a8b7f59a30620e866d11eb21a9933b34..de405e14c269657a650deb0a1495b1354e95a3a4 100644 (file)
--- 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