X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fanno.c;h=2647d971a034af247ead81f18c30d9651cb4fc59;hp=fe0d65f294d75c5dbe10ea2bfa7a56e41cb0f0c9;hb=ccf4f175ef4c4e7522f9510a4a1149c15d810dd9;hpb=d54c8db8bdf01e8381890f7729bc0ef4a055ea11

diff --git a/uip/anno.c b/uip/anno.c
index fe0d65f..2647d97 100644
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -26,25 +26,25 @@ static struct swit switches[] = {
 #define DATESW 1
 	{ "date", 0 },
 #define NDATESW 2
-	{ "nodate", 0 },
+	{ "nodate", 2 },
 #define TEXTSW 3
 	{ "text body", 0 },
 #define VERSIONSW 4
-	{ "version", 0 },
+	{ "Version", 0 },
 #define HELPSW 5
 	{ "help", 0 },
 #define LISTSW 6
-	{ "list", 1 },
+	{ "list", 0 },
 #define DELETESW 7
-	{ "delete", 2 },
+	{ "delete", 0 },
 #define NUMBERSW 8
-	{ "number", 2 },
+	{ "number", 0 },
 #define APPENDSW 9
-	{ "append", 1 },
+	{ "append", 0 },
 #define PRESERVESW 10
-	{ "preserve", 1 },
+	{ "preserve", 0 },
 #define NOPRESERVESW 11
-	{ "nopreserve", 3 },
+	{ "nopreserve", 2 },
 	{ NULL, 0 }
 };
 
@@ -74,9 +74,7 @@ main(int argc, char **argv)
 	int append = 0;  /* append annotations instead of default prepend */
 	int number = 0; /* delete specific number of like elements if set */
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 	context_read();
 
@@ -188,7 +186,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	if (file && (folder || !msgs.size)) {
+	if (file && (folder || msgs.size)) {
 		adios(NULL, "Don't intermix files and messages.");
 	}
 	if (!datesw && !text) {