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
635c75b1
Commit
635c75b1
authored
Jul 09, 2009
by
Kenichi Handa
Browse files
(fontset_find_font): Fix previous change.
parent
49405d0e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
10 deletions
+14
-10
src/ChangeLog
src/ChangeLog
+4
-0
src/fontset.c
src/fontset.c
+10
-10
No files found.
src/ChangeLog
View file @
635c75b1
2009-07-09 Kenichi Handa <handa@m17n.org>
* fontset.c (fontset_find_font): Fix previous change.
2009-07-08 Michael Albinus <michael.albinus@gmx.de>
* dbusbind.c (xd_initialize, Fdbus_call_method, xd_read_message)
...
...
src/fontset.c
View file @
635c75b1
...
...
@@ -575,25 +575,25 @@ fontset_find_font (fontset, c, face, id, fallback)
Lisp_Object
font_def
;
Lisp_Object
font_entity
,
font_object
;
found_index
=
i
;
if
(
i
==
0
)
{
/* Try the element matching with the charset ID at first. */
found_index
=
charset_matched
;
if
(
charset_matched
>
0
)
{
/* Try the element matching with the charset ID at first. */
found_index
=
charset_matched
;
/* Make this negative so that we don't come here in the
next loop. */
charset_matched
=
-
charset_matched
;
/* We must try the first element in the next loop. */
i
--
;
}
}
else
if
(
i
!=
-
charset_matched
)
{
found_index
=
i
;
}
else
else
if
(
i
==
-
charset_matched
)
{
/* We have already tried this element and the followings
that have the same font specifications
. So, skip them
all. */
that have the same font specifications
in the first
iteration. So, skip them
all. */
rfont_def
=
AREF
(
vec
,
i
);
font_def
=
RFONT_DEF_FONT_DEF
(
rfont_def
);
for
(;
i
+
1
<
ASIZE
(
vec
);
i
++
)
...
...
@@ -610,7 +610,7 @@ fontset_find_font (fontset, c, face, id, fallback)
rfont_def
=
AREF
(
vec
,
found_index
);
if
(
NILP
(
rfont_def
))
{
if
(
charset_matched
<
0
)
if
(
i
<
0
)
continue
;
/* This is a sign of not to try the other fonts. */
return
Qt
;
...
...
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