Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
493dcf2c
Commit
493dcf2c
authored
Apr 23, 2009
by
Kenichi Handa
Browse files
(Fx_list_fonts): If a font size is specified in PATTERN, set it in
returned scalable fonts.
parent
7f3bc720
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
1 deletion
+21
-1
src/ChangeLog
src/ChangeLog
+5
-0
src/xfaces.c
src/xfaces.c
+16
-1
No files found.
src/ChangeLog
View file @
493dcf2c
2009-04-23 Kenichi Handa <handa@m17n.org>
* xfaces.c (Fx_list_fonts): If a font size is specified in
PATTERN, set it in returned scalable fonts.
2009-04-22 Chong Yidong <cyd@stupidchicken.com>
* keyboard.c (Fset_input_meta_mode): Doc fix.
...
...
src/xfaces.c
View file @
493dcf2c
...
...
@@ -1904,7 +1904,22 @@ the WIDTH times as wide as FACE on FRAME. */)
}
args
[
0
]
=
Flist_fonts
(
font_spec
,
frame
,
maximum
,
font_spec
);
for
(
tail
=
args
[
0
];
CONSP
(
tail
);
tail
=
XCDR
(
tail
))
XSETCAR (tail, Ffont_xlfd_name (XCAR (tail), Qnil));
{
Lisp_Object
font_entity
;
font_entity
=
XCAR
(
tail
);
if
((
NILP
(
AREF
(
font_entity
,
FONT_SIZE_INDEX
))
||
XINT
(
AREF
(
font_entity
,
FONT_SIZE_INDEX
))
==
0
)
&&
!
NILP
(
AREF
(
font_spec
,
FONT_SIZE_INDEX
)))
{
/* This is a scalable font. For backward compatibility,
we set the specified size. */
font_entity
=
Fcopy_font_spec
(
font_entity
);
ASET
(
font_entity
,
FONT_SIZE_INDEX
,
AREF
(
font_spec
,
FONT_SIZE_INDEX
));
}
XSETCAR
(
tail
,
Ffont_xlfd_name
(
font_entity
,
Qnil
));
}
if
(
NILP
(
frame
))
/* We don't have to check fontsets. */
return
args
[
0
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment