procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adapt last change to Android

Browse source 
* src/sfntfont.c (sfnt_parse_style): Replace unrepresentable
characters in DESC->adstyle with ` '.
This commit is contained in:
Po Lu 2024-05-20 21:13:44 +08:00
parent 5957e57080
commit 9db24de481
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/sfntfont.c
View file

@ -454,8 +454,9 @@ static struct sfnt_style_desc sfnt_width_descriptions[] =
static void
sfnt_parse_style (Lisp_Object style_name, struct sfnt_font_desc *desc)
{
char *style, *single, *saveptr;
char *style, *single, *saveptr, c;
int i;
ptrdiff_t x;
USE_SAFE_ALLOCA;
/* Fill in default values. slant seems to not be consistent with
@ -555,7 +556,19 @@ sfnt_parse_style (Lisp_Object style_name, struct sfnt_font_desc *desc)
/* The adstyle must be a symbol, so intern it if it is set. */
if (!NILP (desc->adstyle))
desc->adstyle = Fintern (desc->adstyle, Qnil);
{
/* Characters that can't be represented in an XLFD must be
replaced. */
for (x = 0; x < SBYTES (desc->adstyle); ++x)
{
c = SREF (desc->adstyle, x);
if (c == '-' || c == '*' || c == '?' && c == '"')
SSET (desc->adstyle, x, ' ');
}
desc->adstyle = Fintern (desc->adstyle, Qnil);
}
SAFE_FREE ();
}