--- nextmarked.xpm.orig	Thu Aug  8 20:52:34 2002
+++ nextmarked.xpm	Fri Aug  9 19:54:41 2002
@@ -1,29 +1,32 @@
 /* XPM */
 static char * nextmarked_xpm[] = {
-"16 16 10 1",
+"16 16 13 1",
 " 	c None",
 ".	c #000000",
-"+	c #7FFF7F",
-"@	c #468E46",
-"#	c #2A552A",
-"$	c #0E1D0E",
-"%	c #54AA54",
-"&	c #63C763",
-"*	c #71E371",
-"=	c #1C391C",
-"    ..          ",
-"    .+.         ",
-"    address@hidden        ",
-"    ......      ",
-"   address@hidden     ",
-"   address@hidden     ",
-"   ..&address@hidden    ",
-"    .++*$.=+.   ",
-"    .+&$.$*+.   ",
-"    .+$.#++.    ",
-"    .*.=++.     ",
-"    .++++.      ",
-"    .%...       ",
-"    .%..        ",
-"    .*.         ",
-"    ..          "};
+"+	c #79F479",
+"@	c #7EFE7E",
+"#	c #7CF97C",
+"$	c #7EFD7E",
+"%	c #7DFC7D",
+"&	c #7FFF7F",
+"*	c #73E873",
+"=	c #7DFB7D",
+"-	c #79F379",
+";	c #72E672",
+">	c #76EE76",
+"   ..  ....     ",
+"   .++......    ",
+"   address@hidden  ...   ",
+"   .#..$%  ..   ",
+"   .&&&&@* ..   ",
+"   .&&&&&....   ",
+"   .&&&&=...    ",
+"   .&&&-...&;.  ",
+"   .&&&...&&..  ",
+"   .&&$..&>..   ",
+"   .&&@..&.     ",
+"   .&&@..       ",
+"   .&&@         ",
+"   .&. ..       ",
+"   ... ..       ",
+"   ..  ..       "};
--- prevmarked.xpm.orig	Thu Aug  8 20:52:34 2002
+++ prevmarked.xpm	Fri Aug  9 19:54:41 2002
@@ -1,29 +1,24 @@
 /* XPM */
 static char * prevmarked_xpm[] = {
-"16 16 10 1",
+"16 16 5 1",
 " 	c None",
 ".	c #000000",
 "+	c #7FFF7F",
-"@	c #54AA54",
-"#	c #0E1D0E",
-"$	c #468E46",
-"%	c #2A552A",
-"&	c #63C763",
-"*	c #71E371",
-"=	c #1C391C",
-"          ..    ",
-"         .+.    ",
-"       address@hidden    ",
-"     .....#.    ",
-"    address@hidden    ",
-"    address@hidden    ",
-"    .%&++$..    ",
-"   .++++*#..    ",
-"   .+++&#.#.    ",
-"    .++#.%+.    ",
-"     .*.=++.    ",
-"      .++++.    ",
-"       ..++.    ",
-"       ..++.    ",
-"         .+.    ",
-"          ..    "};
+"@	c #6DDC6D",
+"#	c #6CD96C",
+"     ....  ..   ",
+"    ...... ..   ",
+"   ..   ...+.   ",
+"   ..    ..+.   ",
+"      address@hidden   ",
+"     ..++..+.   ",
+"   ...+...++.   ",
+"  ..++...+++.   ",
+"  ..#...++++.   ",
+"   . ..+++++.   ",
+"     ..+++++.   ",
+"     .. ++++.   ",
+"        .+++.   ",
+"     .. ...+.   ",
+"     ..   ...   ",
+"     ..    ..   "};
--- intl/dcigettext.c.orig	Fri Aug  9 19:54:56 2002
+++ intl/dcigettext.c	Fri Aug  9 19:55:45 2002
@@ -972,18 +972,18 @@
      size_t translation_len;
 {
   struct loaded_domain *domaindata = (struct loaded_domain *) domain->data;
-  unsigned long int index;
+  unsigned long int Index;
   const char *p;
 
-  index = plural_eval (domaindata->plural, n);
-  if (index >= domaindata->nplurals)
+  Index = plural_eval (domaindata->plural, n);
+  if (Index >= domaindata->nplurals)
     /* This should never happen.  It means the plural expression and the
        given maximum value do not match.  */
-    index = 0;
+    Index = 0;
 
   /* Skip INDEX strings at TRANSLATION.  */
   p = translation;
-  while (index-- > 0)
+  while (Index-- > 0)
     {
 #ifdef _LIBC
       p = __rawmemchr (p, '\0');