Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
2a1ef5be
Commit
2a1ef5be
authored
Jan 05, 2010
by
Kenichi Handa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fontset.c (fontset_find_font): Fix getting the frame pointer.
parent
b25d6a02
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
src/ChangeLog
src/ChangeLog
+4
-0
src/fontset.c
src/fontset.c
+2
-2
No files found.
src/ChangeLog
View file @
2a1ef5be
2010-01-05 Kenichi Handa <handa@m17n.org>
* fontset.c (fontset_find_font): Fix getting the frame pointer.
2010-01-04 Stefan Monnier <monnier@iro.umontreal.ca>
* dbusbind.c (xd_remove_watch): Avoid trying to convert a void* to
...
...
src/fontset.c
View file @
2a1ef5be
...
...
@@ -533,8 +533,8 @@ fontset_find_font (fontset, c, face, id, fallback)
{
Lisp_Object
vec
,
font_group
;
int
i
,
charset_matched
=
0
,
found_index
;
FRAME_PTR
f
=
(
FRAMEP
(
FONTSET_FRAME
(
fontset
))
)
?
XFRAME
(
selected_frame
)
:
XFRAME
(
FONTSET_FRAME
(
fontset
));
FRAME_PTR
f
=
(
FRAMEP
(
FONTSET_FRAME
(
fontset
))
?
XFRAME
(
FONTSET_FRAME
(
fontset
))
:
XFRAME
(
selected_frame
))
;
Lisp_Object
rfont_def
;
font_group
=
fontset_get_font_group
(
fontset
,
fallback
?
-
1
:
c
);
...
...
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