Annotations will always be done inplace from now on.

[mmh] / uip / repl.c

diff --git a/uip/repl.c b/uip/repl.c
index 95b4f69..354bb79 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -37,33 +37,27 @@ static struct swit switches[] = {
        { "format", 5 },
 #define NFRMTSW  12
        { "noformat", 7 },
-#define INPLSW  13
-       { "inplace", 0 },
-#define NINPLSW  14
-       { "noinplace", 0 },
-#define MIMESW  15
+#define MIMESW  13
        { "mime", 0 },
-#define NMIMESW  16
+#define NMIMESW  14
        { "nomime", 0 },
-#define QURYSW  17
+#define QURYSW  15
        { "query", 0 },
-#define NQURYSW  18
+#define NQURYSW  16
        { "noquery", 0 },
-#define WHATSW  19
+#define WHATSW  17
        { "whatnowproc program", 0 },
-#define NWHATSW  20
+#define NWHATSW  18
        { "nowhatnowproc", 0 },
-#define WIDTHSW  21
-       { "width columns", 0 },
-#define VERSIONSW  22
+#define VERSIONSW  19
        { "version", 0 },
-#define HELPSW  23
+#define HELPSW  20
        { "help", 0 },
-#define FILESW  24
+#define FILESW  21
        { "file file", 4 },  /* interface from msh */
 
 #ifdef MHE
-#define BILDSW  25
+#define BILDSW  22
        { "build", 5 },  /* interface from mhe */
 #endif
 
@@ -87,7 +81,6 @@ short cccc = -1;
 short ccme = -1;
 short querysw = 0;
 
-short outputlinelen = OUTPUTLINELEN;
 short groupreply = 0;  /* Is this a group reply? */
 
 int mime = 0;  /* include original as MIME part */
@@ -105,7 +98,7 @@ void docc(char *, int);
 int
 main(int argc, char **argv)
 {
-       int anot = 0, inplace = 1;
+       int anot = 0;
        int nedit = 0, nwhat = 0;
        char *cp, *cwd, *dp, *maildir, *file = NULL;
        char *folder = NULL, *msg = NULL;
@@ -241,13 +234,6 @@ main(int argc, char **argv)
                                filter = NULL;
                                continue;
 
-                       case INPLSW:
-                               inplace++;
-                               continue;
-                       case NINPLSW:
-                               inplace = 0;
-                               continue;
-
                        case MIMESW:
                                mime++;
                                filter = NULL;
@@ -263,14 +249,6 @@ main(int argc, char **argv)
                                querysw = 0;
                                continue;
 
-                       case WIDTHSW:
-                               if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s",
-                                                       argp[-2]);
-                               if ((outputlinelen = atoi(cp)) < 10)
-                                       adios(NULL, "impossible width %d",
-                                                       outputlinelen);
-                               continue;
                        }
                }
                if (*cp == '+' || *cp == '@') {
@@ -300,9 +278,9 @@ main(int argc, char **argv)
 
 #ifdef MHE
        strncpy(drft, buildsw ? toabsdir("reply")
-               : m_draft("new"), sizeof(drft));
+               : m_draft(seq_beyond), sizeof(drft));
 #else
-       strncpy(drft, m_draft("new"), sizeof(drft));
+       strncpy(drft, m_draft(seq_beyond), sizeof(drft));
 #endif /* MHE */
 
        if (file) {
@@ -315,7 +293,7 @@ main(int argc, char **argv)
                ** We are replying to a message.
                */
                if (!msg)
-                       msg = "cur";
+                       msg = seq_cur;
                if (!folder)
                        folder = getcurfol();
                maildir = toabsdir(folder);
@@ -358,13 +336,13 @@ main(int argc, char **argv)
                        form = etcpath(replcomps);
        }
 
-       replout(in, msg, drft, mp, outputlinelen, mime, form, filter, fcc);
+       replout(in, msg, drft, mp, mime, form, filter, fcc);
        fclose(in);
 
        if (nwhat)
                done(0);
        what_now(ed, nedit, NOUSE, drft, msg, 0, mp, anot ? "Replied" : NULL,
-                       inplace, cwd);
+                       cwd);
        done(1);
        return 1;
 }