Mercurial > emacs
changeset 97024:c46e4c1d8339
(w32font_has_char): Handle the case where we can't
determine the script for a character.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Fri, 25 Jul 2008 21:44:37 +0000 |
| parents | 910ca036b4b6 |
| children | e72be8a4fdb8 |
| files | src/w32font.c |
| diffstat | 1 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/w32font.c Fri Jul 25 18:39:38 2008 +0000 +++ b/src/w32font.c Fri Jul 25 21:44:37 2008 +0000 @@ -292,6 +292,8 @@ return -1; supported_scripts = assq_no_quit (QCscript, extra); + /* If font doesn't claim to support any scripts, then we can't be certain + until we open it. */ if (!CONSP (supported_scripts)) return -1; @@ -299,7 +301,16 @@ script = CHAR_TABLE_REF (Vchar_script_table, c); - return (memq_no_quit (script, supported_scripts)) ? -1 : 0; + /* If we don't know what script the character is from, then we can't be + certain until we open it. Also if the font claims support for the script + the character is from, it may only have partial coverage, so we still + can't be certain until we open the font. */ + if (NILP (script) || memq_no_quit (script, supported_scripts)) + return -1; + + /* Font reports what scripts it supports, and none of them are the script + the character is from, so it is a definite no. */ + return 0; } /* w32 implementation of encode_char for font backend.