# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1227772905 0
# Node ID 0a43374c0145cc9fac1c1ac3704b40ca696a37fc
# Parent  a33d93f0c185b543476f28c1ba3e3a0ec2ca677d
(fontset_add): Adjusted for the change of
char_table_ref_and_range.
(fontset_get_font_group): Likewise.
(Ffontset_info): Likewise.

diff -r a33d93f0c185 -r 0a43374c0145 src/fontset.c
--- a/src/fontset.c	Thu Nov 27 08:01:29 2008 +0000
+++ b/src/fontset.c	Thu Nov 27 08:01:45 2008 +0000
@@ -352,9 +352,8 @@
       int from1, to1;
 
       do {
+	from1 = from, to1 = to;
 	args[idx] = char_table_ref_and_range (fontset, from, &from1, &to1);
-	if (to < to1)
-	  to1 = to;
 	char_table_set_range (fontset, from, to1,
 			      NILP (args[idx]) ? args[1 - idx]
 			      : Fvconcat (2, args));
@@ -460,7 +459,7 @@
 {
   Lisp_Object font_group;
   Lisp_Object base_fontset;
-  int from, to, i;
+  int from = 0, to = MAX_CHAR, i;
 
   xassert (! BASE_FONTSET_P (fontset));
   if (c >= 0)
@@ -1857,13 +1856,11 @@
     {
       for (c = 0; c <= MAX_CHAR; )
 	{
-	  int from, to;
+	  int from = c, to = MAX_5_BYTE_CHAR;
 
 	  if (c <= MAX_5_BYTE_CHAR)
 	    {
 	      val = char_table_ref_and_range (fontsets[k], c, &from, &to);
-	      if (to > MAX_5_BYTE_CHAR)
-		to = MAX_5_BYTE_CHAR;
 	    }
 	  else
 	    {