Annotations will always be done inplace from now on.

[mmh] / uip / forw.c

diff --git a/uip/forw.c b/uip/forw.c
index 9cdb793..44c32a0 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -33,33 +33,29 @@ static struct swit switches[] = {
        { "format", 5 },
 #define NFRMTSW  7
        { "noformat", 7 },
-#define INPLSW  8
-       { "inplace", 0 },
-#define NINPLSW  9
-       { "noinplace", 0 },
-#define MIMESW  10
+#define MIMESW  8
        { "mime", 0 },
-#define NMIMESW  11
+#define NMIMESW  9
        { "nomime", 0 },
-#define DGSTSW  12
+#define DGSTSW  10
        { "digest list", 0 },
-#define ISSUESW  13
+#define ISSUESW  11
        { "issue number", 0 },
-#define VOLUMSW  14
+#define VOLUMSW  12
        { "volume number", 0 },
-#define WHATSW  15
+#define WHATSW  13
        { "whatnowproc program", 0 },
-#define NWHATSW  16
+#define NWHATSW  14
        { "nowhatnowproc", 0 },
-#define VERSIONSW  17
+#define VERSIONSW  15
        { "version", 0 },
-#define HELPSW  18
+#define HELPSW  16
        { "help", 0 },
-#define FILESW  19
+#define FILESW  17
        { "file file", 4 },  /* interface from msh */
 
 #ifdef MHE
-#define BILDSW  22
+#define BILDSW  18
        { "build", 5 },  /* interface from mhe */
 #endif /* MHE */
 
@@ -88,7 +84,7 @@ static int build_form(char *, char *, int, int);
 int
 main(int argc, char **argv)
 {
-       int msgp = 0, anot = 0, inplace = 1, mime = 0;
+       int msgp = 0, anot = 0, mime = 0;
        int issue = 0, volume = 0;
        int nedit = 0, nwhat = 0, in;
        int out, msgnum;
@@ -190,13 +186,6 @@ main(int argc, char **argv)
                                filter = NULL;
                                continue;
 
-                       case INPLSW:
-                               inplace++;
-                               continue;
-                       case NINPLSW:
-                               inplace = 0;
-                               continue;
-
                        case MIMESW:
                                mime++;
                                filter = NULL;
@@ -359,7 +348,7 @@ main(int argc, char **argv)
        if (nwhat)
                done(0);
        what_now(ed, nedit, NOUSE, drft, NULL, 0, mp,
-               anot ? "Forwarded" : NULL, inplace, cwd);
+               anot ? "Forwarded" : NULL, cwd);
        done(1);
        return 1;
 }
@@ -542,7 +531,7 @@ add_forw_hdr(char *draft)
                strncat(buffer, m_name(msgnum),
                                sizeof(buffer)-strlen(buffer)-1);
        }
-       annotate(draft, attach_hdr, buffer, 1, 0, -2, 1);
+       annotate(draft, attach_hdr, buffer, 0, -2, 1);
 }