projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added status to conflict(8) man page to note that it is deprecated.
[mmh]
/
uip
/
anno.c
diff --git
a/uip/anno.c
b/uip/anno.c
index
86fe3c3
..
24726d7
100644
(file)
--- a/
uip/anno.c
+++ b/
uip/anno.c
@@
-2,8
+2,6
@@
/*
* anno.c -- annotate messages
*
/*
* 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.
* 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);
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);
case VERSIONSW:
print_version(invo_name);
- done (1);
+ done (0);
case COMPSW:
if (comp)
case COMPSW:
if (comp)
@@
-236,14
+234,10
@@
main (int argc, char **argv)
else
annotate (draft, comp, text, inplace, datesw, delete, append);
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)
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 */
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
}
static void