X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsortm.c;h=ed0918158eb924bbcd8f43f40209101172878d01;hp=d7dae6127be577772cd8c51b776749444370d20c;hb=ccf4f175ef4c4e7522f9510a4a1149c15d810dd9;hpb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a

diff --git a/uip/sortm.c b/uip/sortm.c
index d7dae61..ed09181 100644
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -16,20 +16,18 @@ static struct swit switches[] = {
 #define TEXTSW  1
 	 { "textfield field", 0 },
 #define NSUBJSW  2
-	 { "notextfield", 0 },
-#define SUBJSW  3
-	 { "subject", -3 },  /* backward-compatibility */
-#define LIMSW  4
+	 { "notextfield", 2 },
+#define LIMSW  3
 	 { "limit days", 0 },
-#define NLIMSW  5
-	 { "nolimit", 0 },
-#define VERBSW  6
+#define NLIMSW  4
+	 { "nolimit", 2 },
+#define VERBSW  5
 	 { "verbose", 0 },
-#define NVERBSW  7
-	 { "noverbose", 0 },
-#define VERSIONSW  8
+#define NVERBSW  6
+	 { "noverbose", 2 },
+#define VERSIONSW  7
 	 { "Version", 0 },
-#define HELPSW  9
+#define HELPSW  8
 	 { "help", 0 },
 	 { NULL, 0 }
 };
@@ -75,9 +73,7 @@ main(int argc, char **argv)
 	struct msgs *mp;
 	struct smsg **dlist;
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -122,9 +118,6 @@ main(int argc, char **argv)
 							argp[-2]);
 				continue;
 
-			case SUBJSW:
-				subjsort = "subject";
-				continue;
 			case NSUBJSW:
 				subjsort = NULL;
 				continue;