From e89aeed43e6eca1bda5379cf9b437bce3bc56628 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 22 Aug 2022 13:00:16 +0100 Subject: [PATCH] patch 9.0.0243: text properties "below" sort differently on MS-Windows Problem: Text properties "below" sort differently on MS-Windows. Solution: Use the ID as a tie breaker. (closes #10958) --- src/drawline.c | 7 ++++++- src/version.c | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/drawline.c b/src/drawline.c index 9ad6ecb94..b29f5b19a 100644 --- a/src/drawline.c +++ b/src/drawline.c @@ -9,7 +9,7 @@ /* * drawline.c: Functions for drawing window lines on the screen. - * This is the middle level, drawscreen. is the higher level and screen.c the + * This is the middle level, drawscreen.c is the higher level and screen.c the * lower level. */ @@ -339,6 +339,11 @@ text_prop_compare(const void *s1, const void *s2) // same priority, one that starts first wins if (col1 != col2) return col1 < col2 ? 1 : -1; + + // for a property with text the id can be used as tie breaker + if (tp1->tp_id < 0) + return tp1->tp_id > tp2->tp_id ? 1 : -1; + return 0; } #endif diff --git a/src/version.c b/src/version.c index a3df5cc16..a5392e639 100644 --- a/src/version.c +++ b/src/version.c @@ -731,6 +731,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 243, /**/ 242, /**/ -- 2.40.0