Index: choose.cc
===================================================================
RCS file: /cvs/cygwin-apps/setup/choose.cc,v
retrieving revision 2.158
diff -p -u -r2.158 choose.cc
--- choose.cc	26 Nov 2010 14:21:42 -0000	2.158
+++ choose.cc	17 Jul 2011 19:16:24 -0000
@@ -74,7 +74,6 @@ static ControlAdjuster::ControlInfo Choo
   {IDC_CHOOSE_SEARCH_LABEL, 	CP_LEFT,    CP_TOP},
   {IDC_CHOOSE_SEARCH_EDIT,	CP_LEFT,    CP_TOP},
   {IDC_CHOOSE_KEEP, 		CP_RIGHT,   CP_TOP},
-  {IDC_CHOOSE_PREV, 		CP_RIGHT,   CP_TOP},
   {IDC_CHOOSE_CURR, 		CP_RIGHT,   CP_TOP},
   {IDC_CHOOSE_EXP, 		CP_RIGHT,   CP_TOP},
   {IDC_CHOOSE_VIEW, 		CP_RIGHT,   CP_TOP},
@@ -157,7 +156,7 @@ ChooserPage::createListview ()
     }
 
   /* FIXME: do we need to init the desired fields ? */
-  static int ta[] = { IDC_CHOOSE_KEEP, IDC_CHOOSE_PREV, IDC_CHOOSE_CURR, IDC_CHOOSE_EXP, 0 };
+  static int ta[] = { IDC_CHOOSE_KEEP, IDC_CHOOSE_CURR, IDC_CHOOSE_EXP, 0 };
   rbset (GetHWND (), ta, IDC_CHOOSE_CURR);
   ClearBusy ();
 }
@@ -256,7 +255,6 @@ ChooserPage::OnInit ()
   createListview ();
 
   AddTooltip (IDC_CHOOSE_KEEP, IDS_TRUSTKEEP_TOOLTIP);
-  AddTooltip (IDC_CHOOSE_PREV, IDS_TRUSTPREV_TOOLTIP);
   AddTooltip (IDC_CHOOSE_CURR, IDS_TRUSTCURR_TOOLTIP);
   AddTooltip (IDC_CHOOSE_EXP, IDS_TRUSTEXP_TOOLTIP);
   AddTooltip (IDC_CHOOSE_VIEW, IDS_VIEWBUTTON_TOOLTIP);
@@ -381,11 +379,6 @@ ChooserPage::OnMessageCmd (int id, HWND 
         keepClicked();
       break;
 
-    case IDC_CHOOSE_PREV:
-      if (IsButtonChecked (id))
-        changeTrust (TRUST_PREV);
-      break;
-
     case IDC_CHOOSE_CURR:
       if (IsButtonChecked (id))
         changeTrust (TRUST_CURR);
Index: package_meta.h
===================================================================
RCS file: /cvs/cygwin-apps/setup/package_meta.h,v
retrieving revision 2.40
diff -p -u -r2.40 package_meta.h
--- package_meta.h	22 Nov 2010 12:53:06 -0000	2.40
+++ package_meta.h	17 Jul 2011 19:16:24 -0000
@@ -92,9 +92,12 @@ public:
   std::string action_caption () const;
   packageversion trustp (trusts const t) const
   {
-    return (t == TRUST_PREV && prev) ? prev 
-         : (t == TRUST_TEST && exp) ? exp
-         : curr ? curr : installed;
+    if (t == TRUST_TEST && exp)
+      return exp;
+    else if (curr)
+      return curr;
+    else
+      return installed;
   }
 
   std::string name;			/* package name, like "cygwin" */
Index: res.rc
===================================================================
RCS file: /cvs/cygwin-apps/setup/res.rc,v
retrieving revision 2.91
diff -p -u -r2.91 res.rc
--- res.rc	10 Nov 2010 20:20:33 -0000	2.91
+++ res.rc	17 Jul 2011 19:16:24 -0000
@@ -327,8 +327,7 @@ END
 #define SETUP_VIEW_X		(SETUP_VIEWCAP_X - SETUP_VIEW_W - 5)
 #define SETUP_EXP_X		(SETUP_VIEW_X - SETUP_KPCE_W - 5)
 #define SETUP_CURR_X		(SETUP_EXP_X - SETUP_KPCE_W - 5)
-#define SETUP_PREV_X		(SETUP_CURR_X - SETUP_KPCE_W - 5)
-#define SETUP_KEEP_X		(SETUP_PREV_X - SETUP_KPCE_W - 5)
+#define SETUP_KEEP_X		(SETUP_CURR_X - SETUP_KPCE_W - 5)
 
 // Left-aligned controls.
 #define SETUP_SEARCH_X		(0)
@@ -352,8 +351,6 @@ BEGIN
                     SETUP_CLEAR_W, 12
     CONTROL         "&Keep", IDC_CHOOSE_KEEP, "Button", BS_AUTORADIOBUTTON
                     | WS_GROUP | WS_TABSTOP, SETUP_KEEP_X, 30, SETUP_KPCE_W, 14
-    CONTROL         "&Prev", IDC_CHOOSE_PREV, "Button", BS_AUTORADIOBUTTON,
-                    SETUP_PREV_X, 30, SETUP_KPCE_W, 14
     CONTROL         "&Curr", IDC_CHOOSE_CURR, "Button", BS_AUTORADIOBUTTON,
                     SETUP_CURR_X, 30, SETUP_KPCE_W, 14
     CONTROL         "E&xp", IDC_CHOOSE_EXP, "Button", BS_AUTORADIOBUTTON,
@@ -513,9 +510,6 @@ BEGIN
     IDS_TRUSTKEEP_TOOLTIP   "Sets all packages to their currently installed "
        "version.  This is equivalent to telling setup not to make any "
        "changes to any package."
-    IDS_TRUSTPREV_TOOLTIP   "Globally select the version marked as 'Prev', "
-       "which generally means the version that was last considered stable "
-       "prior to the current stable version."
     IDS_TRUSTCURR_TOOLTIP   "Globally select the version that is currently "
        "considered the most stable. (RECOMMENDED)"
     IDS_TRUSTEXP_TOOLTIP    "Globally select the most recent version, even if "
Index: resource.h
===================================================================
RCS file: /cvs/cygwin-apps/setup/resource.h,v
retrieving revision 2.41
diff -p -u -r2.41 resource.h
--- resource.h	29 Jul 2010 13:06:03 -0000	2.41
+++ resource.h	17 Jul 2011 19:16:24 -0000
@@ -26,7 +26,6 @@
 #define IDS_UNCAUGHT_EXCEPTION_WITH_ERRNO 123
 #define IDS_SKIP_PACKAGE                  124
 #define IDS_TRUSTKEEP_TOOLTIP             125
-#define IDS_TRUSTPREV_TOOLTIP             126
 #define IDS_TRUSTCURR_TOOLTIP             127
 #define IDS_TRUSTEXP_TOOLTIP              128
 #define IDS_VIEWBUTTON_TOOLTIP            129
@@ -117,7 +116,6 @@
 #define IDC_CHOOSE_VIEW                   531
 #define IDC_CHOOSE_EXP                    532
 #define IDC_CHOOSE_CURR                   533
-#define IDC_CHOOSE_PREV                   534
 #define IDC_CHOOSE_LIST                   535
 #define IDC_INS_ACTION                    536
 #define IDC_ROOT_DESKTOP                  537