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
1395c6f5
Commit
1395c6f5
authored
Jul 24, 2009
by
Adrian Robert
Browse files
* nsfont.m (ns_findfonts): Correctly return fallback in match case.
parent
22556bc5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
src/ChangeLog
src/ChangeLog
+4
-0
src/nsfont.m
src/nsfont.m
+5
-1
No files found.
src/ChangeLog
View file @
1395c6f5
2009-07-24 Adrian Robert <Adrian.B.Robert@gmail.com>
* nsfont.m (ns_findfonts): Correctly return fallback in match case.
2009-07-23 Yavor Doganov <yavor@gnu.org>
* nsfont.m (NSFontDescriptor.h): Explicitly include under GNUstep.
...
...
src/nsfont.m
View file @
1395c6f5
...
...
@@ -464,7 +464,7 @@ seems to be limited for now (2009/05) to ja, zh, and ko. */
/* If has non-unicode registry, give up. */
tem
=
AREF
(
font_spec
,
FONT_REGISTRY_INDEX
);
if
(
!
NILP
(
tem
)
&&
!
EQ
(
tem
,
Qiso10646_1
)
&&
!
EQ
(
tem
,
Qunicode_bmp
))
return
isMatch
?
ns_fallback_entity
()
:
Qnil
;
return
isMatch
?
Fcons
(
ns_fallback_entity
()
,
list
)
:
Qnil
;
cFamilies
=
ns_get_covering_families
(
ns_get_req_script
(
font_spec
),
0
.
90
);
...
...
@@ -502,6 +502,10 @@ seems to be limited for now (2009/05) to ja, zh, and ko. */
"synthItal"
),
list
);
}
/* Return something if was a match and nothing found. */
if
(
isMatch
&&
XINT
(
Flength
(
list
))
==
0
)
list
=
Fcons
(
ns_fallback_entity
(),
Qnil
);
if
(
NSFONT_TRACE
)
fprintf
(
stderr
,
" Returning %d entities.
\n
"
,
XINT
(
Flength
(
list
)));
...
...
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