--- freeciv/client/gui-gtk/mapview_org.c	Fri May 28 00:17:44 1999
+++ freeciv/client/gui-gtk/mapview.c	Fri May 28 02:00:22 1999
@@ -125,11 +125,6 @@
 void decrease_unit_hp_smooth(struct unit *punit0, int hp0, 
 			     struct unit *punit1, int hp1)
 {
-  struct timeval tv;
-
-  tv.tv_sec=0;
-  tv.tv_usec=100;
-  
   set_unit_focus_no_center(punit0);
   set_unit_focus_no_center(punit1);
   
@@ -137,7 +132,7 @@
     refresh_tile_mapcanvas(punit0->x, punit0->y, 1);
     refresh_tile_mapcanvas(punit1->x, punit1->y, 1);
 
-    select(0, NULL, NULL, NULL, &tv);
+    usleep(100);
     
     if(punit0->hp>hp0)
       punit0->hp--;
--- freeciv/client/gui-gtk/gui_main_org.c	Fri May 28 00:17:09 1999
+++ freeciv/client/gui-gtk/gui_main.c	Tue May 25 01:56:20 1999
@@ -345,23 +345,32 @@
 
     switch (event->keyval)
     {
+    case GDK_8:
     case GDK_KP_8:
     case GDK_KP_Up:		key_unit_north();		break;
+    case GDK_9:
     case GDK_KP_9:
     case GDK_KP_Page_Up:	key_unit_north_east();		break;
+    case GDK_6:
     case GDK_KP_6:
     case GDK_KP_Right:		key_unit_east();		break;
+    case GDK_3:
     case GDK_KP_3:
     case GDK_KP_Page_Down:	key_unit_south_east();		break;
+    case GDK_2:
     case GDK_KP_2:
     case GDK_KP_Down:		key_unit_south();		break;
+    case GDK_1:
     case GDK_KP_1:
     case GDK_KP_End:		key_unit_south_west();		break;
+    case GDK_4:
     case GDK_KP_4:
     case GDK_KP_Left:		key_unit_west();		break;
+    case GDK_7:
     case GDK_KP_7:
     case GDK_KP_Home:		key_unit_north_west();		break;
     case GDK_KP_Begin:
+    case GDK_5:
     case GDK_KP_5:		focus_to_next_unit();		break;
 
     case GDK_e:			key_end_turn();			break;
--- freeciv/client/gui-xaw/mapview_org.c	Thu May 20 21:22:10 1999
+++ freeciv/client/gui-xaw/mapview.c	Fri May 28 02:11:54 1999
@@ -101,11 +101,6 @@
 void decrease_unit_hp_smooth(struct unit *punit0, int hp0, 
 			     struct unit *punit1, int hp1)
 {
-  struct timeval tv;
-
-  tv.tv_sec=0;
-  tv.tv_usec=100;
-  
   set_unit_focus_no_center(punit0);
   set_unit_focus_no_center(punit1);
   
@@ -113,7 +108,7 @@
     refresh_tile_mapcanvas(punit0->x, punit0->y, 1);
     refresh_tile_mapcanvas(punit1->x, punit1->y, 1);
 
-    select(0, NULL, NULL, NULL, &tv);
+    usleep(100);
     
     if(punit0->hp>hp0)
       punit0->hp--;
--- freeciv/client/gui-xaw/freeciv_org.h	Fri May 28 00:18:34 1999
+++ freeciv/client/gui-xaw/freeciv.h	Mon May 24 20:39:07 1999
@@ -1825,7 +1825,16 @@
    Shift<Key>n:       key-unit-nuke()       \\n\
    <Key>o:            key-unit-transform()  \\n\
    <Key>l:            key-goto-dialog()     \\n\
-   <Key>t:            key-city-workers()",
+   <Key>t:            key-city-workers()    \\n\
+   <Key>9:            key-unit-north-east() \\n\
+   <Key>8:            key-unit-north()      \\n\
+   <Key>7:            key-unit-north-west() \\n\
+   <Key>6:            key-unit-east()       \\n\
+   <Key>5:            focus-to-next-unit()  \\n\
+   <Key>4:            key-unit-west()       \\n\
+   <Key>3:            key-unit-south-east() \\n\
+   <Key>2:            key-unit-south()      \\n\
+   <Key>1:            key-unit-south-west()",
 "Freeciv*overviewcanvas.translations:\
    <BtnDown>:         select-overviewcanvas() \\n\
    <Key>g:            key-unit-goto()       \\n\
--- freeciv/data/freeciv_org	Fri May 28 00:19:17 1999
+++ freeciv/data/freeciv	Mon May 24 20:39:37 1999
@@ -2352,7 +2352,16 @@
    Shift<Key>n:       key-unit-nuke()       \n\
    <Key>o:            key-unit-transform()  \n\
    <Key>l:            key-goto-dialog()     \n\
-   <Key>t:            key-city-workers()
+   <Key>t:            key-city-workers()    \n\
+   <Key>9:            key-unit-north-east() \n\
+   <Key>8:            key-unit-north()      \n\
+   <Key>7:            key-unit-north-west() \n\
+   <Key>6:            key-unit-east()       \n\
+   <Key>5:            focus-to-next-unit()  \n\
+   <Key>4:            key-unit-west()       \n\
+   <Key>3:            key-unit-south-east() \n\
+   <Key>2:            key-unit-south()      \n\
+   <Key>1:            key-unit-south-west()
 
 Freeciv*overviewcanvas.translations:\
    <BtnDown>:         select-overviewcanvas() \n\