patch 8.0.0907: with cp932 font names might be misinterpreted

Problem:    With cp932 font names might be misinterpreted.
Solution:   Do not see "_" as a space when it is the second byte of a double
            byte character. (Ken Takata)

diff --git a/src/os_mswin.c b/src/os_mswin.c
index 815454955c12ff649589c5178c0d296554b7a109..ef756421fc755f239d4cfa670234611d4a81eeaf 100644 (file)
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -2965,7 +2965,9 @@ get_logfont(
        int     did_replace = FALSE;
 
        for (i = 0; lf->lfFaceName[i]; ++i)
-           if (lf->lfFaceName[i] == '_')
+           if (IsDBCSLeadByte(lf->lfFaceName[i]))
+               ++i;
+           else if (lf->lfFaceName[i] == '_')
            {
                lf->lfFaceName[i] = ' ';
                did_replace = TRUE;

diff --git a/src/version.c b/src/version.c
index a941d85cbabc8f0d6956834a12d551e024c80356..40515883cef6e48fbc8407791013be3c24966136 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    907,
 /**/
     906,
 /**/