X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fforw.c;h=a04ebd6f9b9a4713f1c46aa81035f976541361f7;hb=0d33f1e27c4edb7290ef51cd03d50c0dbc9059ef;hp=acf74c43ab403ed9f8969645200f4b89a416d138;hpb=f247cc1de541243bd1c1635e95c8772d45f9bc6e;p=mmh

diff --git a/uip/forw.c b/uip/forw.c
index acf74c4..a04ebd6 100644
--- 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;
 }