Removed configure flag --disable-locale and have it always enabled.

[mmh] / uip / sortm.c

diff --git a/uip/sortm.c b/uip/sortm.c
index 6ba8a9c..ed09181 100644 (file)
--- 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
-        { "version", 0 },
-#define HELPSW  9
+#define NVERBSW  6
+        { "noverbose", 2 },
+#define VERSIONSW  7
+        { "Version", 0 },
+#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;