Cleaned up message_id().

[mmh] / uip / forw.c

diff --git a/uip/forw.c b/uip/forw.c
index acf74c4..a04ebd6 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -167,10 +167,10 @@ main (int argc, char **argv)
                    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);
-                   done (1);
+                   done (0);
 
                case ANNOSW: 
                    anot++;
@@ -438,7 +438,8 @@ try_it_again:
        if (!form)
            form = digestcomps;
     } else {
-       form = forwcomps;
+       if (!form)
+           form = forwcomps;
     }
 
     dat[0] = digest ? issue : msgnum;
@@ -498,7 +499,7 @@ try_it_again:
     if (nwhat)
        done (0);
     what_now (ed, nedit, NOUSE, drft, NULL, 0, mp,
-       anot ? "Forwarded" : NULL, inplace, cwd);
+       anot ? "Forwarded" : NULL, inplace, cwd, 0);
     done (1);
     return 1;
 }