# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1197267821 0
# Node ID 3ce31df2ea581f9b77dc33f92e1f14b6addc87aa
# Parent  fc0bc01543e2fab4c09c9552195fdfd80267ed62
(fontset_find_font): Don't prefer a font of
supplementary charset.

diff -r fc0bc01543e2 -r 3ce31df2ea58 src/fontset.c
--- a/src/fontset.c	Mon Dec 10 01:47:57 2007 +0000
+++ b/src/fontset.c	Mon Dec 10 06:23:41 2007 +0000
@@ -635,23 +635,30 @@
 
   if (id < 0)
     i = 3;
-  else if (id == XFASTINT (AREF (vec, 1)))
-    i = 2;
   else
     {
-      ASET (vec, 1, make_number (id));
-      for (i = 3; i < ASIZE (vec); i++)
-	if (id == XFASTINT (AREF (AREF (AREF (vec, i), 2), 1)))
-	  break;
-      if (i < ASIZE (vec))
-	{
-	  ASET (vec, 2, AREF (vec, i));
-	  i = 2;
-	}
+      struct charset *charset = CHARSET_FROM_ID (id);
+
+      if (charset->supplementary_p)
+	i = 3;
+      else if (id == XFASTINT (AREF (vec, 1)))
+	i = 2;
       else
 	{
-	  ASET (vec, 2, Qnil);
-	  i = 3;
+	  ASET (vec, 1, make_number (id));
+	  for (i = 3; i < ASIZE (vec); i++)
+	    if (id == XFASTINT (AREF (AREF (AREF (vec, i), 2), 1)))
+	      break;
+	  if (i < ASIZE (vec))
+	    {
+	      ASET (vec, 2, AREF (vec, i));
+	      i = 2;
+	    }
+	  else
+	    {
+	      ASET (vec, 2, Qnil);
+	      i = 3;
+	    }
 	}
     }