Removed the draft message in favor for a consistent draft folder facility

[mmh] / uip / anno.c

diff --git a/uip/anno.c b/uip/anno.c
index db1b96c..7fd22c1 100644 (file)
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -5,15 +5,12 @@
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  *
- * Four new options have been added: delete, list, number, and draft.
+ * Three new options have been added: delete, list, and number.
  * Message header fields are used by the new MIME attachment code in
  * the send command.  Adding features to generalize the anno command
  * seemed to be a better approach than the creation of a new command
  * whose features would overlap with those of the anno command.
  *
- * The -draft option causes anno to operate on the current draft file
- * instead of on a message sequence.
- *
  * The -delete option deletes header elements that match the -component
  * field name.  If -delete is used without the -text option, the first
  * header field whose field name matches the component name is deleted.
@@ -62,19 +59,17 @@ static struct swit switches[] = {
        { "version", 0 },
 #define HELPSW 7
        { "help", 0 },
-#define DRFTSW 8
-       { "draft", 2 },
-#define LISTSW 9
+#define LISTSW 8
        { "list", 1 },
-#define DELETESW 10
+#define DELETESW 9
        { "delete", 2 },
-#define NUMBERSW 11
+#define NUMBERSW 10
        { "number", 2 },
-#define APPENDSW 12
+#define APPENDSW 11
        { "append", 1 },
-#define PRESERVESW 13
+#define PRESERVESW 12
        { "preserve", 1 },
-#define NOPRESERVESW 14
+#define NOPRESERVESW 13
        { "nopreserve", 3 },
        { NULL, 0 }
 };
@@ -98,8 +93,6 @@ main (int argc, char **argv)
        struct msgs *mp;
        int append = 0;  /* append annotations instead of default prepend */
        int delete = -2;  /* delete header element if set */
-       char *draft = (char *)0;  /* draft file name */
-       int isdf = 0; /* return needed for m_draft() */
        int list = 0;  /* list header elements if set */
        int number = 0; /* delete specific number of like elements if set */
 
@@ -164,10 +157,6 @@ main (int argc, char **argv)
                                        delete = 0;
                                        continue;
 
-                               case DRFTSW:  /* draft message specified */
-                                       draft = "";
-                                       continue;
-
                                case LISTSW:  /* produce a listing */
                                        list = 1;
                                        continue;
@@ -214,29 +203,6 @@ main (int argc, char **argv)
                                app_msgarg(&msgs, cp);
        }
 
-       /*
-        * We're dealing with the draft message instead of message numbers.
-        * Get the name of the draft and deal with it just as we do with
-        * message numbers below.
-        */
-
-       if (draft != (char *)0) {
-               if (msgs.size != 0)
-                       adios(NULL, "can only have message numbers or -draft.");
-
-               draft = getcpy(m_draft(folder, (char *)0, 1, &isdf));
-
-               make_comp(&comp);
-
-               if (list)
-                       annolist(draft, comp, text, number);
-               else
-                       annotate (draft, comp, text, inplace, datesw, delete, append);
-
-               done(0);
-               return 1;
-       }
-
 #ifdef UCI
        if (strcmp(invo_name, "fanno") == 0)  /* ugh! */
                datesw = 0;