patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Problem: FEAT_TEXT_PROP is a confusing name.
Solution: Use FEAT_PROP_POPUP. (Naruhiko Nishino, closes #5291)
diff --git a/src/ops.c b/src/ops.c
index b2827b2..f269f35 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -828,7 +828,7 @@
/* replace the line */
ml_replace(lnum, newp, FALSE);
-#ifdef FEAT_TEXT_PROP
+#ifdef FEAT_PROP_POPUP
if (curbuf->b_has_textprop && n != 0)
adjust_prop_columns(lnum, bd.textcol, -n, 0);
#endif
@@ -1948,7 +1948,7 @@
int remove_comments = (use_formatoptions == TRUE)
&& has_format_option(FO_REMOVE_COMS);
int prev_was_comment;
-#ifdef FEAT_TEXT_PROP
+#ifdef FEAT_PROP_POPUP
textprop_T **prop_lines = NULL;
int *prop_lengths = NULL;
#endif
@@ -2072,7 +2072,7 @@
cend = newp + sumsize;
*cend = 0;
-#ifdef FEAT_TEXT_PROP
+#ifdef FEAT_PROP_POPUP
// We need to move properties of the lines that are going to be deleted to
// the new long one.
if (curbuf->b_has_textprop && !text_prop_frozen)
@@ -2114,7 +2114,7 @@
(long)(cend - newp - spaces_removed), spaces_removed);
if (t == 0)
break;
-#ifdef FEAT_TEXT_PROP
+#ifdef FEAT_PROP_POPUP
if (prop_lines != NULL)
adjust_props_for_join(curwin->w_cursor.lnum + t,
prop_lines + t - 1, prop_lengths + t - 1,
@@ -2129,7 +2129,7 @@
currsize = (int)STRLEN(curr);
}
-#ifdef FEAT_TEXT_PROP
+#ifdef FEAT_PROP_POPUP
if (prop_lines != NULL)
join_prop_lines(curwin->w_cursor.lnum, newp,
prop_lines, prop_lengths, count);