patch 9.1.0124: display of below/right virtual text with non-virtual text overlap Commit: https://github.com/vim/vim/commit/8055721c2d30f21cfabe7453014f526e7becfc06 Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com> Date: Wed Feb 21 21:00:59 2024 +0100 patch 9.1.0124: display of below/right virtual text with non-virtual text overlap Problem: Virtual text with text_align 'right'/'below' wasn't being used when a non-virtual text property overlaps with the end of the line. This was because the non-virtual text property had a higher priority, preventing the virtual text from being used. Solution: Fix the sorting of text properties so virtual text properties have a higher priority than non-virtual text properties. (Dylan Thacker-Smith) related: #14063 Signed-off-by: Dylan Thacker-Smith <dylan.ah.smith@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>

/* XPM */
static char * tb_replace_xpm[] = {
/* width height ncolors cpp [x_hot y_hot] */
"18 18 9 1 0 0",
/* colors */
" 	s none	m none	c none",
".	s iconColor1	m black	c #000000",
"X	s iconColor2	m none	c #FFFFFF",
"o	s bottomShadowColor	m black	c #5D6069",
"+	s iconGray4	m none	c #949494",
"@	s iconColor3	m black	c #FF0000",
"#	s iconGray3	m none	c #adadad",
"$	s iconGray1	m none	c #dedede",
"%	s iconGray7	m black	c #424242",
/* pixels */
"                  ",
"  .........       ",
"  .XXXXXXX..      ",
"  .X..XXXX.X.     ",
"  oX..oXXX....    ",
"  o.X..XXXXXX.    ",
"  +....oXXXXX.o   ",
"  .XXX..XXXXX.o   ",
" ..oXo...XXXX.o   ",
"  +XXXXXXXXXX+o   ",
"  .X@@XX@XXX....  ",
"  .Xo@XX@@XX.#$.. ",
"  .XXo@@@@@X....  ",
"  .XXXXX@@XX.#$.. ",
"  .XXXXX@XXX.#$.. ",
"  ......o..%....  ",
"     ooooooooo    ",
"                  "};