diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/gui-gtk/citydlg.c freeciv/client/gui-gtk/citydlg.c
--- FreecivCVS/client/gui-gtk/citydlg.c	Thu Jul  6 11:20:20 2000
+++ freeciv/client/gui-gtk/citydlg.c	Fri Jul  7 01:28:17 2000
@@ -780,9 +780,10 @@
 
   if((punit=player_find_unit_by_id(game.player_ptr, (size_t)data)) &&
      (pcity=map_get_city(punit->x, punit->y)) &&
-     (pdialog=get_city_dialog(pcity)) && ev->button==2) {
+     (pdialog=get_city_dialog(pcity)) && (ev->button==2 || ev->button==3)) {
     activate_unit(punit);
-    close_city_dialog(pdialog);
+    if (ev->button==2)
+      close_city_dialog(pdialog);
   }
 
   return TRUE;
@@ -799,9 +800,10 @@
 
   if((punit=player_find_unit_by_id(game.player_ptr, (size_t)data)) &&
      (pcity=find_city_by_id(punit->homecity)) &&
-     (pdialog=get_city_dialog(pcity)) && ev->button==2) {
+     (pdialog=get_city_dialog(pcity)) && (ev->button==2 || ev->button==3)) {
     activate_unit(punit);
-    close_city_dialog(pdialog);
+    if (ev->button==2)
+      close_city_dialog(pdialog);
   }
 
   return TRUE;
@@ -821,7 +823,7 @@
      (pcity=map_get_city(punit->x, punit->y)) &&
      (pdialog=get_city_dialog(pcity))) {
 
-    if (ev->button==2)
+    if (ev->button==2 || ev->button==3)
       return FALSE;
 
     wd=popup_message_dialog(pdialog->shell, 
@@ -1230,7 +1232,7 @@
      (pcity=find_city_by_id(punit->homecity)) &&
      (pdialog=get_city_dialog(pcity))) {
 
-    if (ev->button==2)
+    if (ev->button==2 || ev->button==3)
       return FALSE;
 
     popup_message_dialog(pdialog->shell,
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/gui-xaw/citydlg.c freeciv/client/gui-xaw/citydlg.c
--- FreecivCVS/client/gui-xaw/citydlg.c	Thu Jul  6 11:20:20 2000
+++ freeciv/client/gui-xaw/citydlg.c	Fri Jul  7 00:38:20 2000
@@ -1345,11 +1345,15 @@
      (pcity=map_get_city(punit->x, punit->y)) &&
      (pdialog=get_city_dialog(pcity))) {
     
-    if(e->type==ButtonRelease && e->xbutton.button==2)  {
+    if(e->type==ButtonRelease && e->xbutton.button==Button2)  {
       activate_unit(punit);
       close_city_dialog(pdialog);
       return;
     }
+    if(e->type==ButtonRelease && e->xbutton.button==Button3)  {
+      activate_unit(punit);
+      return;
+    }
 
     wd=popup_message_dialog(pdialog->shell, 
 			    "presentunitsdialog", 
@@ -1684,9 +1688,13 @@
   if((punit=player_find_unit_by_id(game.player_ptr, (size_t)client_data)))
     if((pcity=find_city_by_id(punit->homecity)))
       if((pdialog=get_city_dialog(pcity)))  {
-	if(e->type==ButtonRelease && e->xbutton.button==2)  {
+	if(e->type==ButtonRelease && e->xbutton.button==Button2)  {
 	  activate_unit(punit);
 	  close_city_dialog(pdialog);
+	  return;
+	}
+	if(e->type==ButtonRelease && e->xbutton.button==Button3)  {
+	  activate_unit(punit);
 	  return;
 	}
 	popup_message_dialog(pdialog->shell,
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/data/Freeciv freeciv/data/Freeciv
--- FreecivCVS/data/Freeciv	Thu Jun 29 19:40:28 2000
+++ freeciv/data/Freeciv	Fri Jul  7 00:41:10 2000
@@ -2944,7 +2944,9 @@
 Freeciv*supportunitcanvas.internalHeight:             0
 Freeciv*supportunitcanvas.translations:		#override \n\
   <Btn2Down>:	set() \n\
-  <Btn2Up>:	notify() unset()
+  <Btn2Up>:	notify() unset() \n\
+  <Btn3Down>:	set() \n\
+  <Btn3Up>:	notify() unset()
 
 Freeciv*supportunitnextcommand.label:		>
 Freeciv*supportunitnextcommand.foreground:	white
@@ -2965,7 +2967,9 @@
 Freeciv*presentunitcanvas.internalHeight:           0
 Freeciv*presentunitcanvas.translations:		#override \n\
   <Btn2Down>:	set() \n\
-  <Btn2Up>:	notify() unset()
+  <Btn2Up>:	notify() unset() \n\
+  <Btn3Down>:	set() \n\
+  <Btn3Up>:	notify() unset()
 
 Freeciv*presentunitnextcommand.label:		>
 Freeciv*presentunitnextcommand.foreground:	white