(w32font_has_char): Always return -1.

2 files changed, 15 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 95cbce4dbb0..b3b5f3371f7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-17  Jason Rumney  <jasonr@gnu.org>
+
+	* w32font.c (w32font_has_char): Always return -1.
+
 2008-12-16  Kenichi Handa  <handa@m17n.org>
 
 	* font.c (font_open_entity): Fix previous change.
diff --git a/src/w32font.c b/src/w32font.c
index f892adeb636..c5546ee9379 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -308,6 +308,12 @@ w32font_has_char (entity, c)
      Lisp_Object entity;
      int c;
 {
+  /* We can't be certain about which characters a font will support until
+     we open it.  Checking the scripts that the font supports turns out
+     to not be reliable.  */
+  return -1;
+
+#if 0
   Lisp_Object supported_scripts, extra, script;
   DWORD mask;
 
@@ -333,8 +339,11 @@ w32font_has_char (entity, c)
     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;
+     the character is from. But we still can't be certain, as some fonts
+     will contain some/most/all of the characters in that script without
+     claiming support for it.  */
+  return -1;
+#endif
 }
 
 /* w32 implementation of encode_char for font backend.