patch 8.2.3699: the +title feature adds a lot of #ifdef but little code
Problem: The +title feature adds a lot of #ifdef but little code.
Solution: Graduate the +title feature.
diff --git a/src/optionstr.c b/src/optionstr.c
index 8948830..1b0d8a1 100644
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -979,10 +979,8 @@
errmsg = e_invarg;
else
{
-#ifdef FEAT_TITLE
// May show a "+" in the title now.
redraw_titles();
-#endif
// Add 'fileencoding' to the swap file.
ml_setflags(curbuf);
}
@@ -999,9 +997,7 @@
if (varp == &p_enc)
{
errmsg = mb_init();
-#ifdef FEAT_TITLE
redraw_titles();
-#endif
}
}
@@ -1141,9 +1137,7 @@
curbuf->b_p_tx = TRUE;
else
curbuf->b_p_tx = FALSE;
-#ifdef FEAT_TITLE
redraw_titles();
-#endif
// update flag in swap file
ml_setflags(curbuf);
// Redraw needed when switching to/from "mac": a CR in the text
@@ -1603,11 +1597,10 @@
fill_breakat_flags();
#endif
-#ifdef FEAT_TITLE
// 'titlestring' and 'iconstring'
else if (varp == &p_titlestring || varp == &p_iconstring)
{
-# ifdef FEAT_STL_OPT
+#ifdef FEAT_STL_OPT
int flagval = (varp == &p_titlestring) ? STL_IN_TITLE : STL_IN_ICON;
// NULL => statusline syntax
@@ -1615,10 +1608,9 @@
stl_syntax |= flagval;
else
stl_syntax &= ~flagval;
-# endif
+#endif
did_set_title();
}
-#endif
#ifdef FEAT_GUI
// 'guioptions'
@@ -1805,9 +1797,7 @@
redraw_later(VALID);
}
curbuf->b_help = (curbuf->b_p_bt[0] == 'h');
-#ifdef FEAT_TITLE
redraw_titles();
-#endif
}
}