patch 9.1.1789: MS-Windows: using wrong check for bold font

Problem:  MS-Windows: using wrong check for bold font
          (after v9.1.1347)
Solution: Test if lf.lfWeight == FW_BOLD instead of a simple truthiness
          test (Shay)

Commit 411ae58 replaced an operator conditional

`if lf.lfWeight == FW_BOLD`

with a truthiness check

`if lf.lfWeight`

This conditional determines whether `:b` is inserted into the value of
`guifont`. The truthiness check allowed both FW_STANDARD and FW_BOLD
font weights to trigger the insertion of `:b` into the `guifont` string.
This commit restores the `== FW_BOLD` condition.

fixes: #18383
closes: #18397

Signed-off-by: Shay <shay_public@hotmail.com>
Signed-off-by: Hirohito Higashi <h.east.727@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/gui_w32.c b/src/gui_w32.c
index a29fa91b0a2a1585d0e1496dbb411678021ce490..1ee4ab167786eda96811be48e0b97ae9475b883c 100644 (file)
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -3719,7 +3719,7 @@ logfont2name(LOGFONTW lf)
            res_size - res_len,
            "%s%s%s%s",
            lf.lfItalic ? ":i" : "",
-           lf.lfWeight ? ":b" : "",
+           lf.lfWeight == FW_BOLD ? ":b" : "",
            lf.lfUnderline ? ":u" : "",
            lf.lfStrikeOut ? ":s" : "");
 

diff --git a/src/version.c b/src/version.c
index bad197898eec4a88084b5201f08b6846aa4e02a0..9531ed0d26c241a15044bba4fe87c598bfc4f53c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1789,
 /**/
     1788,
 /**/