X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fanno.c;h=24726d7f458795b7c11c7c5bc666bcce1d6ae153;hb=0ecdc197e9a9a4d2bb6dce395dea152fbc728b6b;hp=86fe3c3a8e320e258b0edfbb221d5b393bcaad5f;hpb=13f84dd50ca5754391dbd3296a5c7425f9363600;p=mmh

diff --git a/uip/anno.c b/uip/anno.c
index 86fe3c3..24726d7 100644
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -2,8 +2,6 @@
 /*
  * anno.c -- annotate messages
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -130,10 +128,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 			invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case COMPSW:
 		    if (comp)
@@ -236,14 +234,10 @@ main (int argc, char **argv)
 	else
 	    annotate (draft, comp, text, inplace, datesw, delete, append);
 
-	return (done(0));
+	done(0);
+	return 1;
     }
 
-#ifdef UCI
-    if (strcmp(invo_name, "fanno") == 0)	/* ugh! */
-	datesw = 0;
-#endif	/* UCI */
-
     if (!context_find ("path"))
 	free (path ("./", TFOLDER));
     if (!msgs.size)
@@ -285,7 +279,8 @@ main (int argc, char **argv)
     seq_save (mp);	/* synchronize message sequences */
     folder_free (mp);	/* free folder/message structure */
     context_save ();	/* save the context file         */
-    return done (0);
+    done (0);
+    return 1;
 }
 
 static void