--- a/src/rangetab.c	Mon Aug 13 09:47:55 2007 +0200
+++ b/src/rangetab.c	Mon Aug 13 09:49:09 2007 +0200
@@ -99,9 +99,9 @@
       if (i > 0)
 	write_c_string (" ", printcharfun);
       if (rte->first == rte->last)
-	sprintf (buf, "%d ", rte->first);
+	sprintf (buf, "%ld ", (long) (rte->first));
       else
-	sprintf (buf, "(%d %d) ", rte->first, rte->last);
+	sprintf (buf, "(%ld %ld) ", (long) (rte->first), (long) (rte->last));
       write_c_string (buf, printcharfun);
       print_internal (rte->val, printcharfun, 1);
     }
@@ -199,7 +199,7 @@
 
 static Lisp_Object
 get_range_table (EMACS_INT pos, int nentries, struct range_table_entry *tab,
-		 Lisp_Object defalt)
+		 Lisp_Object default_)
 {
   int left = 0, right = nentries;
   
@@ -219,7 +219,7 @@
 	return entry->val;
     }
 
-  return defalt;
+  return default_;
 }
 
 DEFUN ("range-table-p", Frange_table_p, 1, 1, 0, /*
@@ -227,7 +227,7 @@
 */
        (object))
 {
-  return (RANGE_TABLEP (object) ? Qt : Qnil);
+  return RANGE_TABLEP (object) ? Qt : Qnil;
 }
 
 DEFUN ("make-range-table", Fmake_range_table, 0, 0, 0, /*
@@ -272,7 +272,7 @@
 Find value for position POS in TABLE.
 If there is no corresponding value, return DEFAULT (defaults to nil).
 */
-       (pos, table, defalt))
+       (pos, table, default_))
 {
   struct Lisp_Range_Table *rt;
   EMACS_INT po;
@@ -284,7 +284,7 @@
   po = XINT (pos);
 
   return get_range_table (po, Dynarr_length (rt->entries),
-			  Dynarr_atp (rt->entries, 0), defalt);
+			  Dynarr_atp (rt->entries, 0), default_);
 }
 
 void
@@ -658,7 +658,7 @@
 
 Lisp_Object
 unified_range_table_lookup (void *unrangetab, EMACS_INT pos,
-			    Lisp_Object defalt)
+			    Lisp_Object default_)
 {
   void *new_dest;
   struct unified_range_table *un;
@@ -667,7 +667,7 @@
   new_dest = (char *) unrangetab + * (char *) unrangetab;
   un = (struct unified_range_table *) new_dest;
 
-  return get_range_table (pos, un->nentries, &un->first, defalt);
+  return get_range_table (pos, un->nentries, &un->first, default_);
 }
 
 /* Return number of entries in a unified range table. */