Annotations will always be done inplace from now on.

[mmh] / uip / comp.c

diff --git a/uip/comp.c b/uip/comp.c
index a256f71..4536372 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -143,7 +143,7 @@ main(int argc, char **argv)
                ** Take a message as the "form" for the new message.
                */
                if (!msg)
-                       msg = "cur";
+                       msg = seq_cur;
                if (!folder)
                        folder = getcurfol();
                maildir = toabsdir(folder);
@@ -174,7 +174,8 @@ main(int argc, char **argv)
                in = open_form(&form, components);
 
 try_it_again:
-       strncpy(drft, m_draft(use ? (msg?msg:"cur") : "new"), sizeof(drft));
+       strncpy(drft, m_draft(use ? (msg?msg:seq_cur) : seq_beyond),
+                       sizeof(drft));
 
        /*
        ** Check if we have an existing draft
@@ -199,26 +200,26 @@ try_it_again:
                        if (!(argp = getans("\nDisposition? ", aqrunl)))
                                done(1);
                        switch (i = smatch(*argp, aqrunl)) {
-                               case NOSW:
-                                       done(0);
-                               case NEWSW:
-                                       use = NOUSE;
-                                       goto try_it_again;
-                               case YESW:
-                                       break;
-                               case USELSW:
-                                       use++;
-                                       goto edit_it;
-                               case LISTDSW:
-                                       showfile(++argp, drft);
-                                       break;
-                               case REFILSW:
-                                       if (refile(++argp, drft) == 0)
-                                               i = YESW;
-                                       break;
-                               default:
-                                       advise(NULL, "say what?");
-                                       break;
+                       case NOSW:
+                               done(0);
+                       case NEWSW:
+                               use = NOUSE;
+                               goto try_it_again;
+                       case YESW:
+                               break;
+                       case USELSW:
+                               use++;
+                               goto edit_it;
+                       case LISTDSW:
+                               showfile(++argp, drft);
+                               break;
+                       case REFILSW:
+                               if (refile(++argp, drft) == 0)
+                                       i = YESW;
+                               break;
+                       default:
+                               advise(NULL, "say what?");
+                               break;
                        }
                }
        } else if (use) {
@@ -236,7 +237,7 @@ edit_it:
 
        if (nwhat)
                done(0);
-       what_now(ed, nedit, use, drft, NULL, 0, NULLMP, NULL, 0, cwd);
+       what_now(ed, nedit, use, drft, NULL, 0, NULLMP, NULL, cwd);
        done(1);
        return 1;
 }