1 files changed, 3 insertions, 6 deletions

diff --git a/src/fontset.c b/src/fontset.c
index e1ba05ea3e8..9053fbdc1f3 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -352,9 +352,8 @@ fontset_add (fontset, range, elt, add)
       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 @@ fontset_get_font_group (Lisp_Object fontset, int c)
 {
   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 @@ fontset.  The format is the same as above.  */)
     {
       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
             {