patch 9.0.0188: strange effects when using "text_align" with non-zero column
Problem: Strange effects when using virtual text with "text_align" and
non-zero column. (Martin Tournoij)
Solution: Give an error. (closes #10888)
diff --git a/src/errors.h b/src/errors.h
index 3b23c88..8aad956 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -3313,4 +3313,6 @@
#ifdef FEAT_PROP_POPUP
EXTERN char e_cannot_use_negative_id_after_adding_textprop_with_text[]
INIT(= N_("E1293: Cannot use a negative id after adding a textprop with text"));
+EXTERN char e_can_only_use_text_align_when_column_is_zero[]
+ INIT(= N_("E1294: Can only use text_align when column is zero"));
#endif
diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
index c6d15b5..701e853 100644
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -2530,6 +2530,8 @@
call StopVimInTerminal(buf)
call delete('XscriptPropsWithTextAfter')
+
+ call assert_fails('call prop_add(1, 2, #{text: "yes", text_align: "right", type: "some"})', 'E1294:')
endfunc
func Test_props_with_text_after_below_trunc()
diff --git a/src/textprop.c b/src/textprop.c
index 45023e8..f33edc2 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -488,6 +488,11 @@
if (p == NULL)
goto theend;
+ if (start_col != 0)
+ {
+ emsg(_(e_can_only_use_text_align_when_column_is_zero));
+ goto theend;
+ }
if (STRCMP(p, "right") == 0)
flags |= TP_FLAG_ALIGN_RIGHT;
else if (STRCMP(p, "below") == 0)
diff --git a/src/version.c b/src/version.c
index 1e326b3..6675c3a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 188,
+/**/
187,
/**/
186,