* casetab.c (set_identity, shuffle): Likewise.

2 files changed, 7 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9029fff9820..a979af1050d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
 
         * charset.c (load_charset_map): <, not <=, for optimization.
         * chartab.c (sub_char_table_set_range, char_table_set_range): Likewise.
+        * casetab.c (set_identity, shuffle): Likewise.
 
         * xmenu.c (set_frame_menubar): Allocate smaller local vectors.
         This also lets GCC 4.6.0 generate slightly better loop code.
diff --git a/src/casetab.c b/src/casetab.c
index 56f6b065358..9a1accf6940 100644
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -191,7 +191,8 @@ set_identity (Lisp_Object table, Lisp_Object c, Lisp_Object elt)
 {
   if (NATNUMP (elt))
     {
-      int from, to;
+      int from;
+      unsigned to;
 
       if (CONSP (c))
         {
@@ -200,7 +201,7 @@ set_identity (Lisp_Object table, Lisp_Object c, Lisp_Object elt)
         }
       else
         from = to = XINT (c);
-      for (; from <= to; from++)
+      for (to++; from < to; from++)
         CHAR_TABLE_SET (table, from, make_number (from));
     }
 }
@@ -215,7 +216,8 @@ shuffle (Lisp_Object table, Lisp_Object c, Lisp_Object elt)
 {
   if (NATNUMP (elt))
     {
-      int from, to;
+      int from;
+      unsigned to;
 
       if (CONSP (c))
         {
@@ -225,7 +227,7 @@ shuffle (Lisp_Object table, Lisp_Object c, Lisp_Object elt)
       else
         from = to = XINT (c);
 
-      for (; from <= to; from++)
+      for (to++; from < to; from++)
         {
           Lisp_Object tem = Faref (table, elt);
           Faset (table, elt, make_number (from));