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/edit.c b/src/edit.c
index e1bf63d..4f53333 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -1417,7 +1417,7 @@
/* Trigger CursorMoved if the cursor moved. Not when the popup menu is
* visible, the command might delete it. */
if (ready && (has_cursormovedI()
-# ifdef FEAT_TEXT_PROP
+# ifdef FEAT_PROP_POPUP
|| popup_visible
# endif
# if defined(FEAT_CONCEAL)
@@ -1442,7 +1442,7 @@
update_curswant();
ins_apply_autocmds(EVENT_CURSORMOVEDI);
}
-#ifdef FEAT_TEXT_PROP
+#ifdef FEAT_PROP_POPUP
if (popup_visible)
popup_check_cursor_pos();
#endif
@@ -3775,7 +3775,7 @@
cc = replace_pop();
if (cc > 0)
{
-#ifdef FEAT_TEXT_PROP
+#ifdef FEAT_PROP_POPUP
size_t len_before = 0; // init to shut up GCC
if (curbuf->b_has_textprop)
@@ -3835,7 +3835,7 @@
// mark the buffer as changed and prepare for displaying
changed_bytes(curwin->w_cursor.lnum, curwin->w_cursor.col);
-#ifdef FEAT_TEXT_PROP
+#ifdef FEAT_PROP_POPUP
if (curbuf->b_has_textprop)
{
size_t len_now = STRLEN(ml_get_curline());
@@ -4807,7 +4807,7 @@
}
/*
- * Delete upto starting point, start of line or previous word.
+ * Delete up to starting point, start of line or previous word.
*/
else
{
@@ -5609,7 +5609,7 @@
if ((State & REPLACE_FLAG) && !(State & VREPLACE_FLAG))
for (temp = i; --temp >= 0; )
replace_join(repl_off);
-#ifdef FEAT_TEXT_PROP
+#ifdef FEAT_PROP_POPUP
curbuf->b_ml.ml_line_len -= i;
#endif
}