summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-08-11 20:55:55 +0200
committerBram Moolenaar <Bram@vim.org>2017-08-11 20:55:55 +0200
commit89e06c807ac63030dd163092e1c58f9ce350aeee (patch)
tree90a74fc8dcb300b55b75293e179053a6d82e46c8
parentd9bc8a801aeaffa77d4094d43bf97f0ced3db92b (diff)
downloadvim-git-89e06c807ac63030dd163092e1c58f9ce350aeee.tar.gz
patch 8.0.0907: with cp932 font names might be misinterpretedv8.0.0907
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)
-rw-r--r--src/os_mswin.c4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/os_mswin.c b/src/os_mswin.c
index 815454955..ef756421f 100644
--- 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 a941d85cb..40515883c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 907,
+/**/
906,
/**/
905,